diff --git a/client/main.lua b/client/main.lua
index 94eb8247..1311d3df 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -176,7 +176,7 @@ function OpenShopMenu ()
                             x = Config.Zones.ShopOutside.Pos.x,
                             y = Config.Zones.ShopOutside.Pos.y,
                             z = Config.Zones.ShopOutside.Pos.z
-                          }, -20.0, function (vehicle)
+                          }, Config.Zones.ShopOutside.Heading, function (vehicle)
 
                             TaskWarpPedIntoVehicle(playerPed, vehicle, -1)
 
@@ -213,7 +213,7 @@ function OpenShopMenu ()
                             x = Config.Zones.ShopOutside.Pos.x,
                             y = Config.Zones.ShopOutside.Pos.y,
                             z = Config.Zones.ShopOutside.Pos.z
-                          }, -20.0, function (vehicle)
+                          }, Config.Zones.ShopOutside.Heading, function (vehicle)
 
                             TaskWarpPedIntoVehicle(playerPed, vehicle, -1)
 
@@ -252,7 +252,7 @@ function OpenShopMenu ()
                       x = Config.Zones.ShopOutside.Pos.x,
                       y = Config.Zones.ShopOutside.Pos.y,
                       z = Config.Zones.ShopOutside.Pos.z
-                    }, -20.0, function (vehicle)
+                    }, Config.Zones.ShopOutside.Heading, function (vehicle)
 
                       TaskWarpPedIntoVehicle(playerPed, vehicle, -1)
 
@@ -320,7 +320,7 @@ function OpenShopMenu ()
         x = Config.Zones.ShopInside.Pos.x,
         y = Config.Zones.ShopInside.Pos.y,
         z = Config.Zones.ShopInside.Pos.z
-      }, 90.0, function(vehicle)
+      }, Config.Zones.ShopInside.Heading, function(vehicle)
         table.insert(LastVehicles, vehicle)
         TaskWarpPedIntoVehicle(playerPed, vehicle, -1)
         FreezeEntityPosition(vehicle, true)
@@ -334,7 +334,7 @@ function OpenShopMenu ()
     x = Config.Zones.ShopInside.Pos.x,
     y = Config.Zones.ShopInside.Pos.y,
     z = Config.Zones.ShopInside.Pos.z
-  }, 90.0, function (vehicle)
+  }, Config.Zones.ShopInside.Heading, function (vehicle)
     table.insert(LastVehicles, vehicle)
     TaskWarpPedIntoVehicle(playerPed, vehicle, -1)
     FreezeEntityPosition(vehicle, true)
@@ -584,7 +584,7 @@ function OpenPopVehicleMenu ()
           x = Config.Zones.ShopInside.Pos.x,
           y = Config.Zones.ShopInside.Pos.y,
           z = Config.Zones.ShopInside.Pos.z
-        }, 90.0, function (vehicle)
+        }, Config.Zones.ShopInside.Heading, function (vehicle)
 
           table.insert(LastVehicles, vehicle)
 
diff --git a/config.lua b/config.lua
index 1d59f97f..aac0ae8e 100644
--- a/config.lua
+++ b/config.lua
@@ -13,37 +13,39 @@ Config.Zones = {
   ShopEntering = {
     Pos   = { x = -33.777, y = -1102.021, z = 25.422 },
     Size  = { x = 1.5, y = 1.5, z = 1.0 },
-    Type  = 1
+    Type  = 1,
   },
 
   ShopInside = {
-    Pos   = { x = -47.570, y = -1097.221, z = 25.422 },
-    Size  = { x = 1.5, y = 1.5, z = 1.0 },
-    Type  = -1
+    Pos     = { x = -47.570, y = -1097.221, z = 25.422 },
+    Size    = { x = 1.5, y = 1.5, z = 1.0 },
+    Heading = -20.0,
+    Type    = -1,
   },
 
   ShopOutside = {
-    Pos   = { x = -28.637, y = -1085.691, z = 25.565 },
-    Size  = { x = 1.5, y = 1.5, z = 1.0 },
-    Type  = -1
+    Pos     = { x = -28.637, y = -1085.691, z = 25.565 },
+    Size    = { x = 1.5, y = 1.5, z = 1.0 },
+    Heading = 90.0,
+    Type    = -1,
   },
 
   BossActions = {
     Pos   = { x = -32.065, y = -1114.277, z = 25.422 },
     Size  = { x = 1.5, y = 1.5, z = 1.0 },
-    Type  = -1
+    Type  = -1,
   },
 
   GiveBackVehicle = {
     Pos   = { x = -18.227, y = -1078.558, z = 25.675 },
     Size  = { x = 3.0, y = 3.0, z = 1.0 },
-    Type  = (Config.EnablePlayerManagement and 1 or -1)
+    Type  = (Config.EnablePlayerManagement and 1 or -1),
   },
 
   ResellVehicle = {
     Pos   = { x = -44.630, y = -1080.738, z = 25.683 },
     Size  = { x = 3.0, y = 3.0, z = 1.0 },
-    Type  = 1
+    Type  = 1,
   },
 
 }