diff --git a/client/main.lua b/client/main.lua
index 5ba395b5..ed69f73c 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -23,6 +23,7 @@ local CurrentAction              = nil
 local CurrentActionMsg           = ''
 local CurrentActionData          = {}
 local CurrentDispatchRequestId   = -1
+local PhoneNumberSources         = {}
 
 Citizen.CreateThread(function()
 
@@ -71,6 +72,7 @@ AddEventHandler('esx_phone:loaded', function(phoneNumber, contacts)
 	PhoneData.contacts = {}
 
 	for i=1, #contacts, 1 do
+		contacts[i].online = (PhoneNumberSources[contacts[i].number] == nil and false or NetworkIsPlayerActive(GetPlayerFromServerId(PhoneNumberSources[contacts[i].number]))),
 		table.insert(PhoneData.contacts, contacts[i])
 	end
 
@@ -82,12 +84,12 @@ AddEventHandler('esx_phone:loaded', function(phoneNumber, contacts)
 end)
 
 RegisterNetEvent('esx_phone:addContact')
-AddEventHandler('esx_phone:addContact', function(name, phoneNumber, isOnline)
+AddEventHandler('esx_phone:addContact', function(name, phoneNumber)
 
 	table.insert(PhoneData.contacts, {
 		name   = name,
 		number = phoneNumber,
-		online = isOnline
+		online = (PhoneNumberSources[contacts[i].number] == nil and false or NetworkIsPlayerActive(GetPlayerFromServerId(PhoneNumberSources[contacts[i].number]))),
 	})
 	-- CALL HERE RELOADCONTACT
 	SendNUIMessage({
@@ -133,7 +135,7 @@ end)
 RegisterNetEvent('esx_phone:onMessage')
 AddEventHandler('esx_phone:onMessage', function(phoneNumber, message, position, anon, job, dispatchRequestId)
 
-	ESX.ShowNotification(_U('new_message'))
+	ESX.ShowNotification(_U('new_message', message))
 
 	SendNUIMessage({
 		newMessage  = true,
@@ -177,6 +179,16 @@ AddEventHandler('esx_phone:stopDispatch', function(dispatchRequestId, playerName
 
 end)
 
+RegisterNetEvent('esx_phone:setPhoneNumberSource')
+AddEventHandler('esx_phone:setPhoneNumberSource', function(phoneNumber, source)
+
+	if source == -1 then
+		PhoneNumberSources[phoneNumber] = nil
+	else
+		PhoneNumberSources[phoneNumber] = source
+	end
+end)
+
 RegisterNUICallback('setGPS', function(data)
 	SetNewWaypoint(data.x,  data.y)
 	ESX.ShowNotification(_U('gps_position'))
@@ -185,12 +197,18 @@ end)
 RegisterNUICallback('send', function(data)
 
 	local phoneNumber = data.number
+	local playerPed   = GetPlayerPed(-1)
+	local coords      = GetEntityCoords(playerPed)
 
 	if tonumber(phoneNumber) ~= nil then
 		phoneNumber = tonumber(phoneNumber)
 	end
 
-	TriggerServerEvent('esx_phone:send', phoneNumber, data.message, data.anonyme)
+	TriggerServerEvent('esx_phone:send', phoneNumber, data.message, data.anonyme, {
+		x = coords.x,
+		y = coords.y,
+		z = coords.z
+	})
 
 	SendNUIMessage({
 		showMessageEditor = false
diff --git a/html/scripts/app.js b/html/scripts/app.js
index a4f64f5a..3afebe53 100644
--- a/html/scripts/app.js
+++ b/html/scripts/app.js
@@ -36,6 +36,7 @@
 	
 	let showMain = function() {
 		$('.screen').removeClass('active');
+		$('.screen *').attr('disabled', 'disabled');
 	}
 	
 	let showRepertoire = function() {
@@ -58,6 +59,8 @@
 	
 	let showAddContact = function() {
 		$('#contact').addClass('active');
+		$('.screen *').attr('disabled', 'disabled');
+		$('.screen.active *').removeAttr('disabled');
 	}
 	
 	let hideAddContact = function() {
@@ -70,6 +73,8 @@
 		$('#writer').addClass('active');
 		$('#writer_number').val(cnum);
 		$('#writer .header-title').html(cname);
+		$('.screen *').attr('disabled', 'disabled');
+		$('.screen.active *').removeAttr('disabled');
 	}
 
 	let hideNewMessage = function() {		
@@ -145,6 +150,7 @@
 	let showPhone = function(phoneData){
 		reloadPhone(phoneData);
 		$('#phone').show();
+		showMain();
 		isPhoneShowed = true;
 	}
 
diff --git a/html/scripts/app_de.js b/html/scripts/app_de.js
index bdc0e71f..fa6bb6a7 100644
--- a/html/scripts/app_de.js
+++ b/html/scripts/app_de.js
@@ -1,6 +1,6 @@
 (function(){
-
-	let ContactTpl =
+	
+	let ContactTpl = 
 		'<div class="contact {{online}}">' +
 			'<div class="sender-info">' +
 				'<div class="center">' +
@@ -10,15 +10,15 @@
 			'<div class="actions"><span class="new-msg newMsg-btn" data-contact-number="{{phoneNumberData}}" data-contact-name="{{senderData}}"></span></div>' +
 		'</div>'
 	;
-
-	let MessageTpl =
+	
+	let MessageTpl = 
 		'<div class="message">' +
 			'<div class="sender-info">' +
 				'<div class="center">' +
 					'<span class="sender">{{sender}}</span><br/><span class="phone-number">#{{phoneNumber}}</span>' +
-				'</div>' +
-			'</div>' +
-			'<div class="body">{{message}}</div>' +
+				'</div>' + 
+			'</div>' + 
+			'<div class="body">{{message}}</div>' + 
 			'<div class="actions"><span class="new-msg {{anonyme}} reply-btn" data-contact-number="{{phoneNumberData}}" data-contact-name="{{senderData}}"></span><span class="gps {{activeGPS}} gps-btn" data-gpsX="{{gpsLocationX}}" data-gpsY="{{gpsLocationY}}"></span><span class="ok-btn {{showOK}}" data-contact-number="{{okNumberData}}" data-contact-job="{{jobData}}"></span></div>' +
 		'</div>'
 	;
@@ -33,52 +33,57 @@
 	let isMessageEditorOpen = false;
 	let isMessagesOpen      = false;
 	let isPhoneShowed       = false;
-
+	
 	let showMain = function() {
 		$('.screen').removeClass('active');
+		$('.screen *').attr('disabled', 'disabled');
 	}
-
+	
 	let showRepertoire = function() {
 		$('#repertoire').addClass('active');
 	}
-
+	
 	let hideRepertoire = function() {
 		$('#repertoire').removeClass('active');
 	}
-
-	let showMessages = function(){
+	
+	let showMessages = function(){	
 		$('#messages').addClass('active');
 		isMessagesOpen = true;
 	}
 
-	let hideMessages = function(){
+	let hideMessages = function(){		
 		$('#messages').removeClass('active');
 		isMessagesOpen = false;
 	}
-
+	
 	let showAddContact = function() {
 		$('#contact').addClass('active');
+		$('.screen *').attr('disabled', 'disabled');
+		$('.screen.active *').removeAttr('disabled');
 	}
-
+	
 	let hideAddContact = function() {
 		$('#contact').removeClass('active');
 		$('#contact_name').val('');
 		$('#contact_number').val('');
 	}
-
+	
 	let showNewMessage = function(cnum, cname) {
 		$('#writer').addClass('active');
 		$('#writer_number').val(cnum);
 		$('#writer .header-title').html(cname);
+		$('.screen *').attr('disabled', 'disabled');
+		$('.screen.active *').removeAttr('disabled');
 	}
 
-	let hideNewMessage = function() {
+	let hideNewMessage = function() {		
 		$('#writer').removeClass('active');
 		$('#writer_number').val('');
 		$('#writer_message').val('');
 		$('#writer .header-title').html('');
 	}
-
+	
 	let showGPS = function(xPos, yPos) {
 		$.post('http://esx_phone/setGPS', JSON.stringify({
 			x: parseFloat(xPos),
@@ -88,13 +93,13 @@
 	}
 
 	let renderContacts = function(){
-
+		
 		let contactHTML = '';
-
+		
 		if(contacts.length > 0) {
 
 			for(let i=0; i<contacts.length; i++) {
-
+				
 				let view = {
 					phoneNumber    : contacts[i].value,
 					sender         : contacts[i].label,
@@ -112,15 +117,15 @@
 		} else {
 			contactHTML = '<div class="contact no-item online"><p class="no-item">Keine Kontakte</p></div>';
 		}
-
+		
 		$('#phone #repertoire .repertoire-list').html(contactHTML);
-
+	
 		$('.contact.online .new-msg').click(function() {
 			showNewMessage($(this).attr('data-contact-number'), $(this).attr('data-contact-name'));
 		});
-
+		
 	}
-
+	
 	$('.contact.online .new-msg').click(function() {
 		showNewMessage($(this).attr('data-contact-number'));
 	});
@@ -145,18 +150,19 @@
 	let showPhone = function(phoneData){
 		reloadPhone(phoneData);
 		$('#phone').show();
+		showMain();
 		isPhoneShowed = true;
 	}
 
-	let hidePhone = function(){
+	let hidePhone = function(){		
 		$('#phone').hide();
 		isPhoneShowed = false;
 	}
-
+	
 	let messages = [];
 
 	let addMessage = function(phoneNumber, pmessage, pposition, panonyme, pjob){
-
+		
 		messages.push({
 			value   : phoneNumber,
 			message : pmessage,
@@ -166,20 +172,20 @@
 		})
 
 		let messageHTML = '';
-
+		
 		if(messages.length >  0) {
-
+			
 			for(let i=0; i<messages.length; i++) {
 
 				let fromName   = "Unknown";
 				let fromNumber = messages[i].value;
 				let anonyme    = null;
-
+				
 				if(messages[i].job != "player")
 					fromName = messages[i].job;
 
 				if(messages[i].anonyme) {
-
+					
 					if(messages[i].job == "player")
 						fromName = "Anonymous";
 
@@ -195,7 +201,7 @@
 
 					anonyme = '';
 				}
-
+				
 				let view = {
 					anonyme        : anonyme,
 					phoneNumber    : fromNumber,
@@ -210,7 +216,7 @@
 					jobData        : (messages[i].job == 'player') ? '' : messages[i].job,
 					showOK         : (messages[i].job == 'player') ? '' : 'showOK'
 				}
-
+				
 				let html = Mustache.render(MessageTpl, view);
 
 				messageHTML = html + messageHTML;
@@ -218,20 +224,20 @@
 		} else {
 			messageHTML = '<div class="message no-item"><p class="no-item">Keine Nachrichten</p></div>';
 		}
-
+		
 		$('#phone #messages .messages-list').html(messageHTML);
-
+		
 		$('.message .new-msg').click(function() {
 			showNewMessage($(this).attr('data-contact-number'), $(this).attr('data-contact-name'));
 		});
-
+		
 		$('.message .gps').click(function() {
 			showGPS($(this).attr('data-gpsX'), $(this).attr('data-gpsY'));
 		});
-
+		
 		$('.message .ok-btn').click(function() {
 			$.post('http://esx_phone/send', JSON.stringify({
-				message: $(this).attr('data-contact-job') + ": Receieved!",
+				message: $(this).attr('data-contact-job') + ": Received !",
 				number : $(this).attr('data-contact-number'),
 				anonyme: false
 			}))
@@ -250,7 +256,7 @@
 	}
 
 	let addSpecialContact = function(name, number, base64Icon){
-
+		
 		let found = false
 
 		for(let i=0; i<specialContacts.length; i++)
@@ -319,7 +325,7 @@
 				}
 
 				default : {
-
+					
 					let number = $(this).data('number');
 					let name   = $(this).data('name');
 
@@ -333,9 +339,9 @@
 	}
 
 	$('#writer_send').click(function(){
-
+		
 		let phoneNumber = null
-
+		
 		if(typeof $('#writer_number').val() == 'number')
 			phoneNumber = parseInt($('#writer_number').val());
 		else if (typeof $('#writer_number').val() == 'string')
@@ -363,23 +369,23 @@
 		hideNewMessage();
 		hideMessages();
 	});
-
+	
 	$('#btn-head-back-rep').click(function() {
 		hideRepertoire();
 	});
-
+	
 	$('#btn-head-back-writer, #writer_cancel').click(function() {
 		hideNewMessage();
 	});
-
+	
 	$('#btn-head-back-contact, #contact_cancel').click(function() {
 		hideAddContact();
 	});
-
+	
 	$('#btn-head-new-message').click(function() {
 		showNewMessage('', 'Nouveau message');
 	});
-
+	
 	$('#btn-head-new-contact').click(function() {
 		showAddContact();
 	});
@@ -401,7 +407,7 @@
 			}
 
 			default : {
-
+				
 				let number = $(this).data('number');
 				let name   = $(this).data('name');
 
diff --git a/html/scripts/app_en.js b/html/scripts/app_en.js
index 3b91ca33..c0551140 100644
--- a/html/scripts/app_en.js
+++ b/html/scripts/app_en.js
@@ -1,6 +1,6 @@
 (function(){
-
-	let ContactTpl =
+	
+	let ContactTpl = 
 		'<div class="contact {{online}}">' +
 			'<div class="sender-info">' +
 				'<div class="center">' +
@@ -10,15 +10,15 @@
 			'<div class="actions"><span class="new-msg newMsg-btn" data-contact-number="{{phoneNumberData}}" data-contact-name="{{senderData}}"></span></div>' +
 		'</div>'
 	;
-
-	let MessageTpl =
+	
+	let MessageTpl = 
 		'<div class="message">' +
 			'<div class="sender-info">' +
 				'<div class="center">' +
 					'<span class="sender">{{sender}}</span><br/><span class="phone-number">#{{phoneNumber}}</span>' +
-				'</div>' +
-			'</div>' +
-			'<div class="body">{{message}}</div>' +
+				'</div>' + 
+			'</div>' + 
+			'<div class="body">{{message}}</div>' + 
 			'<div class="actions"><span class="new-msg {{anonyme}} reply-btn" data-contact-number="{{phoneNumberData}}" data-contact-name="{{senderData}}"></span><span class="gps {{activeGPS}} gps-btn" data-gpsX="{{gpsLocationX}}" data-gpsY="{{gpsLocationY}}"></span><span class="ok-btn {{showOK}}" data-contact-number="{{okNumberData}}" data-contact-job="{{jobData}}"></span></div>' +
 		'</div>'
 	;
@@ -33,52 +33,57 @@
 	let isMessageEditorOpen = false;
 	let isMessagesOpen      = false;
 	let isPhoneShowed       = false;
-
+	
 	let showMain = function() {
 		$('.screen').removeClass('active');
+		$('.screen *').attr('disabled', 'disabled');
 	}
-
+	
 	let showRepertoire = function() {
 		$('#repertoire').addClass('active');
 	}
-
+	
 	let hideRepertoire = function() {
 		$('#repertoire').removeClass('active');
 	}
-
-	let showMessages = function(){
+	
+	let showMessages = function(){	
 		$('#messages').addClass('active');
 		isMessagesOpen = true;
 	}
 
-	let hideMessages = function(){
+	let hideMessages = function(){		
 		$('#messages').removeClass('active');
 		isMessagesOpen = false;
 	}
-
+	
 	let showAddContact = function() {
 		$('#contact').addClass('active');
+		$('.screen *').attr('disabled', 'disabled');
+		$('.screen.active *').removeAttr('disabled');
 	}
-
+	
 	let hideAddContact = function() {
 		$('#contact').removeClass('active');
 		$('#contact_name').val('');
 		$('#contact_number').val('');
 	}
-
+	
 	let showNewMessage = function(cnum, cname) {
 		$('#writer').addClass('active');
 		$('#writer_number').val(cnum);
 		$('#writer .header-title').html(cname);
+		$('.screen *').attr('disabled', 'disabled');
+		$('.screen.active *').removeAttr('disabled');
 	}
 
-	let hideNewMessage = function() {
+	let hideNewMessage = function() {		
 		$('#writer').removeClass('active');
 		$('#writer_number').val('');
 		$('#writer_message').val('');
 		$('#writer .header-title').html('');
 	}
-
+	
 	let showGPS = function(xPos, yPos) {
 		$.post('http://esx_phone/setGPS', JSON.stringify({
 			x: parseFloat(xPos),
@@ -88,13 +93,13 @@
 	}
 
 	let renderContacts = function(){
-
+		
 		let contactHTML = '';
-
+		
 		if(contacts.length > 0) {
 
 			for(let i=0; i<contacts.length; i++) {
-
+				
 				let view = {
 					phoneNumber    : contacts[i].value,
 					sender         : contacts[i].label,
@@ -112,15 +117,15 @@
 		} else {
 			contactHTML = '<div class="contact no-item online"><p class="no-item">No contacts</p></div>';
 		}
-
+		
 		$('#phone #repertoire .repertoire-list').html(contactHTML);
-
+	
 		$('.contact.online .new-msg').click(function() {
 			showNewMessage($(this).attr('data-contact-number'), $(this).attr('data-contact-name'));
 		});
-
+		
 	}
-
+	
 	$('.contact.online .new-msg').click(function() {
 		showNewMessage($(this).attr('data-contact-number'));
 	});
@@ -145,18 +150,19 @@
 	let showPhone = function(phoneData){
 		reloadPhone(phoneData);
 		$('#phone').show();
+		showMain();
 		isPhoneShowed = true;
 	}
 
-	let hidePhone = function(){
+	let hidePhone = function(){		
 		$('#phone').hide();
 		isPhoneShowed = false;
 	}
-
+	
 	let messages = [];
 
 	let addMessage = function(phoneNumber, pmessage, pposition, panonyme, pjob){
-
+		
 		messages.push({
 			value   : phoneNumber,
 			message : pmessage,
@@ -166,20 +172,20 @@
 		})
 
 		let messageHTML = '';
-
+		
 		if(messages.length >  0) {
-
+			
 			for(let i=0; i<messages.length; i++) {
 
 				let fromName   = "Unknown";
 				let fromNumber = messages[i].value;
 				let anonyme    = null;
-
+				
 				if(messages[i].job != "player")
 					fromName = messages[i].job;
 
 				if(messages[i].anonyme) {
-
+					
 					if(messages[i].job == "player")
 						fromName = "Anonymous";
 
@@ -195,7 +201,7 @@
 
 					anonyme = '';
 				}
-
+				
 				let view = {
 					anonyme        : anonyme,
 					phoneNumber    : fromNumber,
@@ -210,7 +216,7 @@
 					jobData        : (messages[i].job == 'player') ? '' : messages[i].job,
 					showOK         : (messages[i].job == 'player') ? '' : 'showOK'
 				}
-
+				
 				let html = Mustache.render(MessageTpl, view);
 
 				messageHTML = html + messageHTML;
@@ -218,20 +224,20 @@
 		} else {
 			messageHTML = '<div class="message no-item"><p class="no-item">No messages</p></div>';
 		}
-
+		
 		$('#phone #messages .messages-list').html(messageHTML);
-
+		
 		$('.message .new-msg').click(function() {
 			showNewMessage($(this).attr('data-contact-number'), $(this).attr('data-contact-name'));
 		});
-
+		
 		$('.message .gps').click(function() {
 			showGPS($(this).attr('data-gpsX'), $(this).attr('data-gpsY'));
 		});
-
+		
 		$('.message .ok-btn').click(function() {
 			$.post('http://esx_phone/send', JSON.stringify({
-				message: $(this).attr('data-contact-job') + ": Receieved!",
+				message: $(this).attr('data-contact-job') + ": Received !",
 				number : $(this).attr('data-contact-number'),
 				anonyme: false
 			}))
@@ -250,7 +256,7 @@
 	}
 
 	let addSpecialContact = function(name, number, base64Icon){
-
+		
 		let found = false
 
 		for(let i=0; i<specialContacts.length; i++)
@@ -319,7 +325,7 @@
 				}
 
 				default : {
-
+					
 					let number = $(this).data('number');
 					let name   = $(this).data('name');
 
@@ -333,9 +339,9 @@
 	}
 
 	$('#writer_send').click(function(){
-
+		
 		let phoneNumber = null
-
+		
 		if(typeof $('#writer_number').val() == 'number')
 			phoneNumber = parseInt($('#writer_number').val());
 		else if (typeof $('#writer_number').val() == 'string')
@@ -363,23 +369,23 @@
 		hideNewMessage();
 		hideMessages();
 	});
-
+	
 	$('#btn-head-back-rep').click(function() {
 		hideRepertoire();
 	});
-
+	
 	$('#btn-head-back-writer, #writer_cancel').click(function() {
 		hideNewMessage();
 	});
-
+	
 	$('#btn-head-back-contact, #contact_cancel').click(function() {
 		hideAddContact();
 	});
-
+	
 	$('#btn-head-new-message').click(function() {
 		showNewMessage('', 'Nouveau message');
 	});
-
+	
 	$('#btn-head-new-contact').click(function() {
 		showAddContact();
 	});
@@ -401,7 +407,7 @@
 			}
 
 			default : {
-
+				
 				let number = $(this).data('number');
 				let name   = $(this).data('name');
 
diff --git a/locales/br.lua b/locales/br.lua
index 3017ac44..81698bb7 100644
--- a/locales/br.lua
+++ b/locales/br.lua
@@ -1,6 +1,6 @@
 Locales['br'] = {
 
-	['new_message'] = '~b~Nova mensagem',
+	['new_message'] = '~b~Nova mensagem :~s~ %s',
 	['press_take_call'] = ' - Pressione ~INPUT_CONTEXT~ para aceitar a chamada',
 	['taken_call'] = ' recebeu uma chamada',
 	['gps_position'] = 'Destino inserido no GPS',
diff --git a/locales/en.lua b/locales/en.lua
index 94bf3a54..83ef249f 100644
--- a/locales/en.lua
+++ b/locales/en.lua
@@ -1,6 +1,6 @@
 Locales['en'] = {
 
-	['new_message'] = '~b~New message',
+	['new_message'] = '~b~New message :~s~ %s',
 	['press_take_call'] = ' - Press ~INPUT_CONTEXT~ to take the call',
 	['taken_call'] = ' has taken the call',
 	['gps_position'] = 'destination entered into the GPS',
diff --git a/locales/fr.lua b/locales/fr.lua
index 4927ec7c..4b6c8159 100644
--- a/locales/fr.lua
+++ b/locales/fr.lua
@@ -1,6 +1,6 @@
 Locales['fr'] = {
 
-	['new_message'] = '~b~Nouveau message',
+	['new_message'] = '~b~Nouveau message :~s~ %s',
 	['press_take_call'] = ' - Appuyez sur ~INPUT_CONTEXT~ pour prendre l\'appel',
 	['taken_call'] = ' a pris l\'appel',
 	['gps_position'] = 'position entrée dans le GPS',
diff --git a/server/main.lua b/server/main.lua
index e4df95f7..36e62320 100644
--- a/server/main.lua
+++ b/server/main.lua
@@ -1,12 +1,11 @@
-ESX = nil
+ESX                       = nil
+local DisptachRequestId   = 0
+local PhoneNumbers        = {}
 
 TriggerEvent('esx:getSharedObject', function(obj)
 	ESX = obj
 end)
 
-local RegisteredCallbacks = {}
-local DisptachRequestId   = 0
-
 function GenerateUniquePhoneNumber()
 
 	local foundNumber = false
@@ -62,6 +61,14 @@ AddEventHandler('esx:playerLoaded', function(source)
 
 	local xPlayer = ESX.GetPlayerFromId(source)
 
+	for k,v in pairs(PhoneNumbers) do
+		if tonumber(k) == k then -- If phonenumber is a player phone number
+			for i=1, #v.sources, 1 do
+				TriggerClientEvent('esx_phone:setPhoneNumberSource', source, k, v.sources[i])
+			end
+		end
+	end
+
 	MySQL.Async.fetchAll(
 		'SELECT * FROM users WHERE identifier = @identifier',
 		{
@@ -84,8 +91,23 @@ AddEventHandler('esx:playerLoaded', function(source)
 				)
 			end
 
+			TriggerClientEvent('esx_phone:setPhoneNumberSource', -1, phoneNumber, source)
+
+			PhoneNumbers[phoneNumber] = {
+				type          = 'player',
+				hashDispatch  = false,
+				sharePos      = false,
+				hideNumber    = false,
+				hidePosIfAnon = false,
+				sources       = {source}
+			}
+
 			xPlayer.set('phoneNumber', phoneNumber)
 
+			if PhoneNumbers[xPlayer.job.name] ~= nil then
+				TriggerEvent('esx_phone:addSource', xPlayer.job.name, source)
+			end
+
 			local contacts = {}
 
 			MySQL.Async.fetchAll(
@@ -100,20 +122,7 @@ AddEventHandler('esx:playerLoaded', function(source)
 						table.insert(contacts, {
 							name   = result2[i].name,
 							number = result2[i].number,
-							online = false
 						})
-
-						local xPlayers = ESX.GetPlayers()
-
-						for j=1, #xPlayers, 1 do
-
-							local xPlayer2 = ESX.GetPlayerFromId(xPlayers[j])
-							
-							if xPlayer2.get('phoneNumber') == contacts[i].number then
-								contacts[i].online = true
-							end
-						end
-
 					end
 
 					xPlayer.set('contacts', contacts)
@@ -128,64 +137,123 @@ AddEventHandler('esx:playerLoaded', function(source)
 
 end)
 
+AddEventHandler('esx:playerDropped', function(source)
+	
+	local xPlayer = ESX.GetPlayerFromId(source)
+	
+	TriggerClientEvent('esx_phone:setPhoneNumberSource', -1, xPlayer.get('phoneNumber'), -1)
+
+	PhoneNumbers[xPlayer.get('phoneNumber')] = nil
+
+	if PhoneNumbers[xPlayer.job.name] ~= nil then
+		TriggerEvent('esx_phone:removeSource', xPlayer.job.name, source)
+	end
+
+end)
+
+AddEventHandler('esx:setJob', function(source, job, lastJob)
+	
+	if PhoneNumbers[lastJob.name] ~= nil then
+		TriggerEvent('esx_phone:removeSource', lastJob.name, source)
+	end
+
+	if PhoneNumbers[job.name] ~= nil then
+		TriggerEvent('esx_phone:addSource', job.name, source)
+	end
+
+end)
 
 RegisterServerEvent('esx_phone:reload')
 AddEventHandler('esx_phone:reload', function(phoneNumber)
 
 	local _source  = source
 	local xPlayer  = ESX.GetPlayerFromId(_source)
-	local contacts = {}
+	local contacts = xPlayer.get('contacts')
 
-	MySQL.Async.fetchAll(
-		'SELECT * FROM user_contacts WHERE identifier = @identifier ORDER BY name ASC',
-		{
-			['@identifier'] = xPlayer.identifier
-		},
-		function(result2)
+	TriggerClientEvent('esx_phone:loaded', _source, phoneNumber, contacts)
 
-			for i=1, #result2, 1 do
+end)
 
-				table.insert(contacts, {
-					name   = result2[i].name,
-					number = result2[i].number,
-					online = false
-				})
+RegisterServerEvent('esx_phone:send')
+AddEventHandler('esx_phone:send', function(phoneNumber, message, anon, position)
 
-				local xPlayers = ESX.GetPlayers()
+	local _source = source
+	local xPlayer = ESX.GetPlayerFromId(_source)
 
-				for j=1, #xPlayers, 1 do
+	print('MESSAGE => ' .. xPlayer.name .. '@' .. phoneNumber .. ' : ' .. message)
 
-					local xPlayer2 = ESX.GetPlayerFromId(xPlayers[j])
-					
-					if xPlayer2.get('phoneNumber') == contacts[i].number then
-						contacts[i].online = true
-					end
+	if PhoneNumbers[phoneNumber] ~= nil then
+
+		for i=1, #PhoneNumbers[phoneNumber].sources, 1 do
+
+			if PhoneNumbers[phoneNumber].sources[i] ~= nil then
+
+				local numType          = PhoneNumbers[phoneNumber].type
+				local numHasDispatch   = PhoneNumbers[phoneNumber].hasDispatch
+				local numHide          = PhoneNumbers[phoneNumber].hideNumber
+				local numHidePosIfAnon = PhoneNumbers[phoneNumber].hidePosIfAnon
+				local numPosition      = (PhoneNumbers[phoneNumber].sharePos and position or false)
+				local numSource        = PhoneNumbers[phoneNumber].sources[i]
+
+				if numHidePosIfAnon and anon then
+					numPosition = false
+				end
+
+				if numHasDispatch then
+					TriggerClientEvent('esx_phone:onMessage', numSource, xPlayer.get('phoneNumber'), message, numPosition, (numHide and true or anon), numType, GetDistpatchRequestId())
+				else
+					TriggerClientEvent('esx_phone:onMessage', numSource, xPlayer.get('phoneNumber'), message, numPosition, (numHide and true or anon), numType, false)
 				end
 
 			end
 
-			xPlayer.set('contacts', contacts)
-
-			TriggerClientEvent('esx_phone:loaded', _source, phoneNumber, contacts)
-
 		end
-	)
 
-end)
-
-RegisterServerEvent('esx_phone:registerCallback')
-AddEventHandler('esx_phone:registerCallback', function(cb)
-	table.insert(RegisteredCallbacks, cb)
-end)
-
-RegisterServerEvent('esx_phone:send')
-AddEventHandler('esx_phone:send', function(phoneNumber, message, anon)
-	
-	local _source = source
-
-	for i=1, #RegisteredCallbacks, 1 do
-		RegisteredCallbacks[i](_source, phoneNumber, message, anon)
 	end
+
+end)
+
+AddEventHandler('esx_phone:registerNumber', function(number, type, sharePos, hasDispatch, hideNumber, hidePosIfAnon)
+	
+	local hideNumber    = hideNumber    or false
+	local hidePosIfAnon = hidePosIfAnon or false
+
+	PhoneNumbers[number] = {
+		type          = type,
+		sharePos      = sharePos,
+		hasDispatch   = (hasDispatch or false),
+		hideNumber    = hideNumber,
+		hidePosIfAnon = hidePosIfAnon,
+		sources       = {}
+	}
+
+end)
+
+AddEventHandler('esx_phone:addSource', function(number, source)
+	
+	local found = false
+
+	for i=1, #PhoneNumbers[number].sources, 1 do
+		if PhoneNumbers[number].sources[i] == source then
+			found = true
+			break
+		end
+	end
+
+	if not found then
+		table.insert(PhoneNumbers[number].sources, source)
+	end
+
+end)
+
+AddEventHandler('esx_phone:removeSource', function(number, source)
+	
+	for i=1, #PhoneNumbers[number].sources, 1 do
+		if PhoneNumbers[number].sources[i] == source then
+			PhoneNumbers[number].sources[i] = nil
+		end
+	end
+
 end)
 
 RegisterServerEvent('esx_phone:addPlayerContact')
@@ -244,20 +312,7 @@ AddEventHandler('esx_phone:addPlayerContact', function(phoneNumber, contactName)
 
 								TriggerClientEvent('esx:showNotification', _source, _U('contact_added'))
 
-								local xPlayers = ESX.GetPlayers()
-								local isOnline = false
-
-								for i=1, #xPlayers, 1 do
-
-									local xPlayer2 = ESX.GetPlayerFromId(xPlayers[i])
-									
-									if xPlayer2.get('phoneNumber') == phoneNumber then
-										isOnline = true
-										break
-									end
-								end
-
-								TriggerClientEvent('esx_phone:addContact', _source, contactName, phoneNumber, isOnline)
+								TriggerClientEvent('esx_phone:addContact', _source, contactName, phoneNumber)
 							end
 						)
 
@@ -273,26 +328,6 @@ AddEventHandler('esx_phone:addPlayerContact', function(phoneNumber, contactName)
 
 end)
 
-AddEventHandler('esx_phone:ready', function()
-	TriggerEvent('esx_phone:registerCallback', function(source, phoneNumber, message, anon)
-
-		local xPlayer  = ESX.GetPlayerFromId(source)
-		local xPlayers = ESX.GetPlayers()
-
-		print('MESSAGE => ' .. xPlayer.name .. '@' .. phoneNumber .. ' : ' .. message)
-
-		for i=1, #xPlayers, 1 do
-
-			local xPlayer2 = ESX.GetPlayerFromId(xPlayers[i])
- 			
- 			if xPlayer2.get('phoneNumber') == phoneNumber then
- 				TriggerClientEvent('esx_phone:onMessage', xPlayer2.source, xPlayer.get('phoneNumber'), message, false, anon, 'player', false)
- 			end
- 		end
-
-	end)
-end)
-
 RegisterServerEvent('esx_phone:stopDispatch')
 AddEventHandler('esx_phone:stopDispatch', function(dispatchRequestId)
 	TriggerClientEvent('esx_phone:stopDispatch', -1, dispatchRequestId, GetPlayerName(source))