diff --git a/resources/[carscripts]/lc_fuel/config.lua b/resources/[carscripts]/lc_fuel/config.lua
index 0c192e422..3cd77bda6 100644
--- a/resources/[carscripts]/lc_fuel/config.lua
+++ b/resources/[carscripts]/lc_fuel/config.lua
@@ -543,7 +543,7 @@ Config.Electric = {
         { prop = "prop_electric_01", location = vector4(181.14, 6636.17, 30.61, 180.96), ropeLength = 7.5 },
         { prop = "prop_electric_01", location = vector4(1714.14, 6425.44, 31.79, 156.94), ropeLength = 7.5 },
         { prop = "prop_electric_01", location = vector4(1703.57, 4937.23, 41.08, 56.74), ropeLength = 7.5 },
-        { prop = "prop_electric_01", location = vector4(1993.38, 3777.8, 32.18, 220.1), ropeLength = 7.5 },
+        { prop = "prop_electric_01", location = vector4(1993.38, 3777.8, 31.18, 220.1), ropeLength = 7.5 },
         { prop = "prop_electric_01", location = vector4(1770.86, 3337.97, 40.43, 302.1), ropeLength = 7.5 },
         { prop = "prop_electric_01", location = vector4(2690.25, 3265.62, 54.24, 59.98), ropeLength = 7.5 },
         { prop = "prop_electric_01", location = vector4(1033.32, 2662.91, 38.55, 96.38), ropeLength = 7.5 },
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/.fxap b/resources/[defaultmaps]/fa_studio_davis_policestation/.fxap
new file mode 100644
index 000000000..24c7de335
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/.fxap differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/fxmanifest.lua b/resources/[defaultmaps]/fa_studio_davis_policestation/fxmanifest.lua
new file mode 100644
index 000000000..8a7ff1de8
--- /dev/null
+++ b/resources/[defaultmaps]/fa_studio_davis_policestation/fxmanifest.lua
@@ -0,0 +1,12 @@
+fx_version 'cerulean'
+game 'gta5'
+lua54 "yes"
+
+author 'Fastudio'
+description 'PoliceStation'
+version '1.0.0'
+
+this_is_a_map 'yes'
+
+
+dependency '/assetpacks'
\ No newline at end of file
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/_manifest.ymf b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/_manifest.ymf
new file mode 100644
index 000000000..90106bfee
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/_manifest.ymf differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/davis_police_fa_ytd.ytd b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/davis_police_fa_ytd.ytd
new file mode 100644
index 000000000..07346be4c
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/davis_police_fa_ytd.ytd differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/davis_policestation_placement.ymap b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/davis_policestation_placement.ymap
new file mode 100644
index 000000000..d7ad3822a
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/davis_policestation_placement.ymap differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_arm_cab01.ydr b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_arm_cab01.ydr
new file mode 100644
index 000000000..cf4ecaaa4
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_arm_cab01.ydr differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_armoury_gate.ydr b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_armoury_gate.ydr
new file mode 100644
index 000000000..0d1d53c57
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_armoury_gate.ydr differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_col.ybn b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_col.ybn
new file mode 100644
index 000000000..5a8dd036a
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_col.ybn differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_corridor_gate01.ydr b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_corridor_gate01.ydr
new file mode 100644
index 000000000..24fe6dacd
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_corridor_gate01.ydr differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_det01.ydr b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_det01.ydr
new file mode 100644
index 000000000..ff1f29acf
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_det01.ydr differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_details.ydr b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_details.ydr
new file mode 100644
index 000000000..f61a77eaf
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_details.ydr differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_garage_decal.ydr b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_garage_decal.ydr
new file mode 100644
index 000000000..249061e64
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_garage_decal.ydr differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_garage_door.ydr b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_garage_door.ydr
new file mode 100644
index 000000000..65f39759a
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_garage_door.ydr differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_garage_props.ydr b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_garage_props.ydr
new file mode 100644
index 000000000..6a34c36b4
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_garage_props.ydr differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_kitchen_cabinets.ydr b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_kitchen_cabinets.ydr
new file mode 100644
index 000000000..aef9c19e5
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_kitchen_cabinets.ydr differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_office_windows.ydr b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_office_windows.ydr
new file mode 100644
index 000000000..cbf65ca44
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_office_windows.ydr differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_rangeovrlys.ydr b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_rangeovrlys.ydr
new file mode 100644
index 000000000..944ab38a0
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_rangeovrlys.ydr differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_shell.ydr b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_shell.ydr
new file mode 100644
index 000000000..23cc1cc4b
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_shell.ydr differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_wep_lo.ydr b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_wep_lo.ydr
new file mode 100644
index 000000000..f8dbfd7b2
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/fa_studio_davis_policestation_wep_lo.ydr differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/hi@sc1_19_0.ybn b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/hi@sc1_19_0.ybn
new file mode 100644
index 000000000..419cbeefb
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/hi@sc1_19_0.ybn differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/hi@sc1_19_1.ybn b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/hi@sc1_19_1.ybn
new file mode 100644
index 000000000..791fdd683
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/hi@sc1_19_1.ybn differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/lr_sc1_19_strm_1.ymap b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/lr_sc1_19_strm_1.ymap
new file mode 100644
index 000000000..7c00c3802
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/lr_sc1_19_strm_1.ymap differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/lr_sc1_occl_03.ymap b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/lr_sc1_occl_03.ymap
new file mode 100644
index 000000000..bfae1c340
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/lr_sc1_occl_03.ymap differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/police_davis_metddata_fa.ytyp b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/police_davis_metddata_fa.ytyp
new file mode 100644
index 000000000..3630273fe
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/police_davis_metddata_fa.ytyp differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/sc1_19_0.ybn b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/sc1_19_0.ybn
new file mode 100644
index 000000000..e737134e2
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/sc1_19_0.ybn differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/sc1_19_courts.ydr b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/sc1_19_courts.ydr
new file mode 100644
index 000000000..e983d529d
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/sc1_19_courts.ydr differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/sc1_19_detail_2.ydr b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/sc1_19_detail_2.ydr
new file mode 100644
index 000000000..e46b092df
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/sc1_19_detail_2.ydr differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/sc1_19_detail_3.ydr b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/sc1_19_detail_3.ydr
new file mode 100644
index 000000000..ba5be4089
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/sc1_19_detail_3.ydr differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/sc1_19_ground.ydr b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/sc1_19_ground.ydr
new file mode 100644
index 000000000..957b0661b
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/sc1_19_ground.ydr differ
diff --git a/resources/[defaultmaps]/fa_studio_davis_policestation/stream/sc1_19_sheriff.ydr b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/sc1_19_sheriff.ydr
new file mode 100644
index 000000000..304df47bd
Binary files /dev/null and b/resources/[defaultmaps]/fa_studio_davis_policestation/stream/sc1_19_sheriff.ydr differ
diff --git a/resources/[inventory]/tgiann-inventory/configs/configVendingMachine.lua b/resources/[inventory]/tgiann-inventory/configs/configVendingMachine.lua
index ce281ba1d..24dd70654 100644
--- a/resources/[inventory]/tgiann-inventory/configs/configVendingMachine.lua
+++ b/resources/[inventory]/tgiann-inventory/configs/configVendingMachine.lua
@@ -1,3 +1,4 @@
+config = config or {}
 config.vendingMachine = {
     active = true,
     machines = {
diff --git a/resources/[inventory]/tgiann-inventory/configs/configWeapon.lua b/resources/[inventory]/tgiann-inventory/configs/configWeapon.lua
index 5bcff593e..35072a988 100644
--- a/resources/[inventory]/tgiann-inventory/configs/configWeapon.lua
+++ b/resources/[inventory]/tgiann-inventory/configs/configWeapon.lua
@@ -141,7 +141,6 @@ local weaponList = {
     weapon_navyrevolver          = 500,
     weapon_gadgetpistol          = 500,
     weapon_pistolxm3             = 500,
-    weapon_klog19fde             = 500,  -- Mod
     -- Submachine Guns
     weapon_microsmg              = 1000,
     weapon_smg                   = 1000,