diff --git a/client/main.lua b/client/main.lua
index d8dedfc6..332cc32c 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -1,5 +1,6 @@
 ESX = nil
 local Vehicles = {}
+local PlayerData                = {}
 
 Citizen.CreateThread(function()
 	while ESX == nil do
@@ -13,12 +14,19 @@ local isInLSMarker	 = false
 local myCar 		 = {}
 
 RegisterNetEvent('esx:playerLoaded')
-AddEventHandler('esx:playerLoaded', function()
+AddEventHandler('esx:playerLoaded', function(xPlayer)
+  	PlayerData = xPlayer
 	ESX.TriggerServerCallback('esx_lscustom:getVehiclesPrices', function(vehicles)
 		Vehicles = vehicles
 	end)
 end)
 
+
+RegisterNetEvent('esx:setJob')
+AddEventHandler('esx:setJob', function(job)
+  PlayerData.job = job
+end)
+
 RegisterNetEvent('esx_lscustom:installMod')
 AddEventHandler('esx_lscustom:installMod', function()
 	--Citizen.Trace('installMod')
@@ -341,6 +349,7 @@ end
 
 -- Blips
 Citizen.CreateThread(function()
+
 	for k,v in pairs(Config.Zones)do
 		local blip = AddBlipForCoord(v.Pos.x, v.Pos.y, v.Pos.z)
 		SetBlipSprite(blip, 72)
@@ -362,18 +371,19 @@ Citizen.CreateThread(function()
 			local currentZone = nil
 			local zone 		  = nil
 			local lastZone    = nil
+			if (PlayerData.job ~= nil and PlayerData.job.name == 'mecano') or Config.IsMecanoJobOnly == false then
+				for k,v in pairs(Config.Zones) do
+					if(GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < v.Size.x) then
+						isInLSMarker  = true
 
-			for k,v in pairs(Config.Zones) do
-				if(GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < v.Size.x) then
-					isInLSMarker  = true
+						SetTextComponentFormat("STRING")
+						AddTextComponentString(v.Hint)
+						DisplayHelpTextFromStringLabel(0, 0, 1, -1)
 
-					SetTextComponentFormat("STRING")
-					AddTextComponentString(v.Hint)
-					DisplayHelpTextFromStringLabel(0, 0, 1, -1)
-
-					break
-				else
-					isInLSMarker  = false
+						break
+					else
+						isInLSMarker  = false
+					end
 				end
 			end
 
diff --git a/config.lua b/config.lua
index 626c9454..20f17a09 100644
--- a/config.lua
+++ b/config.lua
@@ -1,6 +1,7 @@
 Config              = {}
 Config.DrawDistance = 100.0
 Config.Locale = 'fr'
+Config.IsMecanoJobOnly = false
 
 Config.Zones = {
     ls1 = {