diff --git a/resources/CHP18D/ulc.lua b/resources/CHP18D/ulc.lua
new file mode 100644
index 000000000..cb1fa590f
--- /dev/null
+++ b/resources/CHP18D/ulc.lua
@@ -0,0 +1,376 @@
+
+--[[ 
+  Ultimate Lighting Controller Config
+  the ULC resource is required to use this configuration
+  get the resource here: https://github.com/Flohhhhh/ultimate-lighting-controller/releases/latest
+  To learn how to setup and use ULC visit here: https://docs.dwnstr.com/ulc/overview
+]]
+                
+return {names = {"chp18charg","chp18chargst"},
+  steadyBurnConfig = {
+    forceOn = false, useTime = false,
+    disableWithLights = false,
+    sbExtras = {}
+  },
+  parkConfig = {
+    usePark = true,
+    useSync = true,
+    syncWith = {"chp18charg","chp18chargst"},
+    pExtras = {2,5},
+    dExtras = {1,2,3,4}
+  },
+  hornConfig = {
+    useHorn = false,
+    hornExtras = {},
+    disableExtras = {}
+  },
+  brakeConfig = {
+    useBrakes = false,
+    speedThreshold = 3,
+    brakeExtras = {},
+    disableExtras = {}
+  },
+  reverseConfig = {
+    useReverse = false,
+    reverseExtras = {},
+    disableExtras = {}
+  },
+  doorConfig = {
+    useDoors = false,
+    driverSide = {enable = {}, disable = {}},
+    passSide = {enable = {}, disable = {}},
+    trunk = {enable ={}, disable = {}}
+  }, 
+  buttons = {
+    {label = "STAGE 1", key = 1, color = "green", extra = 1, linkedExtras = {2,3,4}, oppositeExtras = {}, offExtras = {5,6,7,8,9,10,11,12}, repair = true},
+		{label = "STAGE PRIORITY", key = 2, color = "red", extra = 12, linkedExtras = {4,2}, oppositeExtras = {}, offExtras = {1,3,5,6,7,8,9,10,11}, repair = true},
+		{label = "TA - LEFT", key = 3, color = "amber", extra = 10, linkedExtras = {5,2}, oppositeExtras = {}, offExtras = {1,3,4,6,7,8,9,11,12}, repair = true},
+		{label = "TA - RIGHT ", key = 4, color = "amber", extra = 11, linkedExtras = {2,5}, oppositeExtras = {}, offExtras = {1,3,4,6,7,8,9,10,12}, repair = true},
+		{label = "TA - CENTER", key = 5, color = "amber", extra = 8, linkedExtras = {2,5}, oppositeExtras = {}, offExtras = {1,3,4,6,7,9,10,11,12}, repair = true},
+		{label = "WARNING ", key = 6, color = "amber", extra = 9, linkedExtras = {2}, oppositeExtras = {}, offExtras = {1,3,4,5,6,7,8,10,11,12}, repair = true}
+  },
+  stages = {
+    useStages = false,
+    stageKeys = {},
+  },
+  defaultStages = {
+    useDefaults = false,
+    enableKeys = {},
+    disableKeys = {}
+  }
+},
+
+{names = {"chp15fpiu","chp15fpiup","chp15fpuk9"},
+  steadyBurnConfig = {
+    forceOn = false, useTime = false,
+    disableWithLights = false,
+    sbExtras = {}
+  },
+  parkConfig = {
+    usePark = true,
+    useSync = true,
+    syncWith = {"chp15fpiu","chp15fpiup","chp15fpiuk9"},
+    pExtras = {5,7,4},
+    dExtras = {1,2,3,8,11}
+  },
+  hornConfig = {
+    useHorn = false,
+    hornExtras = {},
+    disableExtras = {}
+  },
+  brakeConfig = {
+    useBrakes = false,
+    speedThreshold = 3,
+    brakeExtras = {},
+    disableExtras = {}
+  },
+  reverseConfig = {
+    useReverse = false,
+    reverseExtras = {},
+    disableExtras = {}
+  },
+  doorConfig = {
+    useDoors = false,
+    driverSide = {enable = {}, disable = {}},
+    passSide = {enable = {}, disable = {}},
+    trunk = {enable ={}, disable = {}}
+  }, 
+  buttons = {
+    {label = "STAGE 1", key = 1, color = "green", extra = 1, linkedExtras = {2,3,8,11}, oppositeExtras = {}, offExtras = {4,5,6,7,9,10,12}, repair = true},
+		{label = "STAGE PRIORITY", key = 2, color = "red", extra = 12, linkedExtras = {2}, oppositeExtras = {}, offExtras = {1,3,4,5,6,7,8,9,10,11}, repair = true},
+		{label = "TA - LEFT", key = 3, color = "amber", extra = 10, linkedExtras = {4,5,7}, oppositeExtras = {}, offExtras = {1,2,3,6,8,9,11,12}, repair = true},
+		{label = "WARNING ", key = 4, color = "amber", extra = 9, linkedExtras = {}, oppositeExtras = {}, offExtras = {1,2,3,4,5,6,7,8,10,11,12}, repair = true}
+  },
+  stages = {
+    useStages = false,
+    stageKeys = {},
+  },
+  defaultStages = {
+    useDefaults = false,
+    enableKeys = {},
+    disableKeys = {}
+  }
+},
+
+{names = {"chp16fpiu","chp16fpiup"},
+  steadyBurnConfig = {
+    forceOn = false, useTime = false,
+    disableWithLights = false,
+    sbExtras = {}
+  },
+  parkConfig = {
+    usePark = true,
+    useSync = true,
+    syncWith = {"chp16fpiu","chp16fpiup"},
+    pExtras = {4,5,7},
+    dExtras = {1,2,3,8,11}
+  },
+  hornConfig = {
+    useHorn = false,
+    hornExtras = {},
+    disableExtras = {}
+  },
+  brakeConfig = {
+    useBrakes = false,
+    speedThreshold = 3,
+    brakeExtras = {},
+    disableExtras = {}
+  },
+  reverseConfig = {
+    useReverse = false,
+    reverseExtras = {},
+    disableExtras = {}
+  },
+  doorConfig = {
+    useDoors = false,
+    driverSide = {enable = {}, disable = {}},
+    passSide = {enable = {}, disable = {}},
+    trunk = {enable ={}, disable = {}}
+  }, 
+  buttons = {
+    {label = "STAGE 1 ", key = 1, color = "green", extra = 1, linkedExtras = {2,3,8,11}, oppositeExtras = {}, offExtras = {4,5,6,7,9,10,12}, repair = true},
+		{label = "STAGE PRIORITY", key = 2, color = "red", extra = 12, linkedExtras = {}, oppositeExtras = {}, offExtras = {1,2,3,4,5,6,7,8,9,10,11}, repair = true},
+		{label = "TA - LEFT ", key = 3, color = "amber", extra = 10, linkedExtras = {4,5,7}, oppositeExtras = {}, offExtras = {1,2,3,6,8,9,11,12}, repair = true},
+		{label = "WARNING ", key = 4, color = "amber", extra = 9, linkedExtras = {}, oppositeExtras = {}, offExtras = {1,2,3,4,5,6,7,8,10,11,12}, repair = true}
+  },
+  stages = {
+    useStages = false,
+    stageKeys = {},
+  },
+  defaultStages = {
+    useDefaults = false,
+    enableKeys = {},
+    disableKeys = {}
+  }
+},
+
+{names = {"chp20tahoe","chp21tahoe","chp23charg","chp23chargp","chp23Durango","chp20charg","CHP18D","chp20fpiup","chp20fpiu"},
+  steadyBurnConfig = {
+    forceOn = false, useTime = false,
+    disableWithLights = false,
+    sbExtras = {}
+  },
+  parkConfig = {
+    usePark = true,
+    useSync = true,
+    syncWith = {"chp20tahoe","chp21tahoe","chp23charg","chp23chargp","chp23Durango","chp20charg","CHP18D","chp20fpiup","chp20fpiu"},
+    pExtras = {3,5},
+    dExtras = {1,2,3,6,7}
+  },
+  hornConfig = {
+    useHorn = false,
+    hornExtras = {},
+    disableExtras = {}
+  },
+  brakeConfig = {
+    useBrakes = false,
+    speedThreshold = 3,
+    brakeExtras = {},
+    disableExtras = {}
+  },
+  reverseConfig = {
+    useReverse = false,
+    reverseExtras = {},
+    disableExtras = {}
+  },
+  doorConfig = {
+    useDoors = false,
+    driverSide = {enable = {}, disable = {}},
+    passSide = {enable = {}, disable = {}},
+    trunk = {enable ={}, disable = {}}
+  }, 
+  buttons = {
+    {label = "STAGE 1 ", key = 1, color = "green", extra = 1, linkedExtras = {2,3,6,7}, oppositeExtras = {}, offExtras = {4,5,8,9,10,11,12}, repair = true},
+		{label = "STAGE PRIORITY", key = 2, color = "red", extra = 4, linkedExtras = {3}, oppositeExtras = {}, offExtras = {1,2,5,6,7,8,9,10,11,12}, repair = true},
+		{label = "TA - LEFT", key = 3, color = "amber", extra = 10, linkedExtras = {3,8,5}, oppositeExtras = {}, offExtras = {1,2,4,6,7,9,11,12}, repair = true},
+		{label = "TA - RIGHT ", key = 4, color = "amber", extra = 11, linkedExtras = {5,3,8}, oppositeExtras = {}, offExtras = {1,2,4,6,7,9,10,12}, repair = true},
+		{label = "TA - CENTER", key = 5, color = "amber", extra = 9, linkedExtras = {3,5,8}, oppositeExtras = {}, offExtras = {1,2,4,6,7,10,11,12}, repair = true},
+		{label = "WARNING ", key = 6, color = "amber", extra = 12, linkedExtras = {8,3}, oppositeExtras = {}, offExtras = {1,2,4,5,6,7,9,10,11}, repair = true}
+  },
+  stages = {
+    useStages = false,
+    stageKeys = {},
+  },
+  defaultStages = {
+    useDefaults = false,
+    enableKeys = {},
+    disableKeys = {}
+  }
+},
+
+{names = {"chp15exped","chp15f250","chp15f250st","chp16ram"},
+  steadyBurnConfig = {
+    forceOn = false, useTime = false,
+    disableWithLights = false,
+    sbExtras = {}
+  },
+  parkConfig = {
+    usePark = true,
+    useSync = true,
+    syncWith = {"chp15exped","chp15f250","chp15f250st","chp16ram"},
+    pExtras = {2,5},
+    dExtras = {1,2,3}
+  },
+  hornConfig = {
+    useHorn = false,
+    hornExtras = {},
+    disableExtras = {}
+  },
+  brakeConfig = {
+    useBrakes = false,
+    speedThreshold = 3,
+    brakeExtras = {},
+    disableExtras = {}
+  },
+  reverseConfig = {
+    useReverse = false,
+    reverseExtras = {},
+    disableExtras = {}
+  },
+  doorConfig = {
+    useDoors = false,
+    driverSide = {enable = {}, disable = {}},
+    passSide = {enable = {}, disable = {}},
+    trunk = {enable ={}, disable = {}}
+  }, 
+  buttons = {
+    {label = "STAGE 1", key = 1, color = "green", extra = 1, linkedExtras = {2,3}, oppositeExtras = {}, offExtras = {4,5,6,7,8,9,10,11,12}, repair = true},
+		{label = "STAGE PRIORITY", key = 2, color = "red", extra = 12, linkedExtras = {2}, oppositeExtras = {}, offExtras = {1,3,4,5,6,7,8,9,10,11}, repair = true},
+		{label = "TA - LEFT ", key = 3, color = "amber", extra = 10, linkedExtras = {2,5}, oppositeExtras = {}, offExtras = {1,3,4,6,7,8,9,11,12}, repair = true},
+		{label = "TA - RIGHT ", key = 4, color = "amber", extra = 11, linkedExtras = {5,2}, oppositeExtras = {}, offExtras = {1,3,4,6,7,8,9,10,12}, repair = true},
+		{label = "WARNING ", key = 5, color = "amber", extra = 9, linkedExtras = {2}, oppositeExtras = {}, offExtras = {1,3,4,5,6,7,8,10,11,12}, repair = true}
+  },
+  stages = {
+    useStages = false,
+    stageKeys = {},
+  },
+  defaultStages = {
+    useDefaults = false,
+    enableKeys = {},
+    disableKeys = {}
+  }
+},
+
+{names = {"chp11cvpi"},
+  steadyBurnConfig = {
+    forceOn = false, useTime = false,
+    disableWithLights = false,
+    sbExtras = {}
+  },
+  parkConfig = {
+    usePark = true,
+    useSync = true,
+    syncWith = {"chp11cvpi"},
+    pExtras = {4,5,7},
+    dExtras = {1,2,3,11,8}
+  },
+  hornConfig = {
+    useHorn = false,
+    hornExtras = {},
+    disableExtras = {}
+  },
+  brakeConfig = {
+    useBrakes = false,
+    speedThreshold = 3,
+    brakeExtras = {},
+    disableExtras = {}
+  },
+  reverseConfig = {
+    useReverse = false,
+    reverseExtras = {},
+    disableExtras = {}
+  },
+  doorConfig = {
+    useDoors = false,
+    driverSide = {enable = {}, disable = {}},
+    passSide = {enable = {}, disable = {}},
+    trunk = {enable ={}, disable = {}}
+  }, 
+  buttons = {
+    {label = "STAGE 1", key = 1, color = "green", extra = 1, linkedExtras = {2,3,8,11}, oppositeExtras = {}, offExtras = {4,5,6,7,9,10,12}, repair = true},
+		{label = "STAGE PRIORITY", key = 2, color = "red", extra = 12, linkedExtras = {2}, oppositeExtras = {}, offExtras = {}, repair = true},
+		{label = "TA - LEFT", key = 3, color = "amber", extra = 10, linkedExtras = {4,5,7}, oppositeExtras = {}, offExtras = {1,2,3,6,8,9,11,12}, repair = true},
+		{label = "WARNING", key = 4, color = "amber", extra = 9, linkedExtras = {}, oppositeExtras = {}, offExtras = {1,2,3,4,5,6,7,8,10,11,12}, repair = true}
+  },
+  stages = {
+    useStages = false,
+    stageKeys = {},
+  },
+  defaultStages = {
+    useDefaults = false,
+    enableKeys = {},
+    disableKeys = {}
+  }
+},
+
+{names = {"chpum15fpiu"},
+  steadyBurnConfig = {
+    forceOn = false, useTime = false,
+    disableWithLights = false,
+    sbExtras = {}
+  },
+  parkConfig = {
+    usePark = true,
+    useSync = true,
+    syncWith = {"chpum15fpiu"},
+    pExtras = {5},
+    dExtras = {1,3}
+  },
+  hornConfig = {
+    useHorn = false,
+    hornExtras = {},
+    disableExtras = {}
+  },
+  brakeConfig = {
+    useBrakes = false,
+    speedThreshold = 3,
+    brakeExtras = {},
+    disableExtras = {}
+  },
+  reverseConfig = {
+    useReverse = false,
+    reverseExtras = {},
+    disableExtras = {}
+  },
+  doorConfig = {
+    useDoors = false,
+    driverSide = {enable = {}, disable = {}},
+    passSide = {enable = {}, disable = {}},
+    trunk = {enable ={}, disable = {}}
+  }, 
+  buttons = {
+    {label = "STAGE 1 ", key = 1, color = "green", extra = 1, linkedExtras = {3}, oppositeExtras = {}, offExtras = {2,4,5,6,7,8,9,10,11,12}, repair = true},
+		{label = "STAGE PRIORITY", key = 2, color = "red", extra = 12, linkedExtras = {2}, oppositeExtras = {}, offExtras = {1,3,4,5,6,7,8,9,10,11}, repair = true},
+		{label = "TA - LEFT", key = 3, color = "amber", extra = 10, linkedExtras = {5}, oppositeExtras = {}, offExtras = {1,2,3,4,6,7,8,9,11,12}, repair = true},
+		{label = "WARNING", key = 4, color = "amber", extra = 9, linkedExtras = {}, oppositeExtras = {}, offExtras = {1,2,3,4,5,6,7,8,10,11,12}, repair = true}
+  },
+  stages = {
+    useStages = false,
+    stageKeys = {},
+  },
+  defaultStages = {
+    useDefaults = false,
+    enableKeys = {},
+    disableKeys = {}
+  }
+}
\ No newline at end of file
diff --git a/resources/[EGRP-CarPacks]/ERGP-Highwaypatrol/stream/chp24pack/chpdurango+hi.ytd b/resources/[EGRP-CarPacks]/ERGP-Highwaypatrol/stream/chp24pack/chpdurango+hi.ytd
deleted file mode 100644
index 529e8032b..000000000
--- a/resources/[EGRP-CarPacks]/ERGP-Highwaypatrol/stream/chp24pack/chpdurango+hi.ytd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b924d9df1521828fffb825834c7cdf4facf72bf53e09d03644b6a60760f6a38c
-size 2647723
diff --git a/resources/[EGRP-CarPacks]/ERGP-Highwaypatrol/stream/chp24pack/chpdurango.yft b/resources/[EGRP-CarPacks]/ERGP-Highwaypatrol/stream/chp24pack/chpdurango.yft
deleted file mode 100644
index 3042fa7e2..000000000
--- a/resources/[EGRP-CarPacks]/ERGP-Highwaypatrol/stream/chp24pack/chpdurango.yft
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0e60b23ea2f5ac82370d395e992d90f25c6b0c90a81e4f9e91b42eb9178a228c
-size 10691183
diff --git a/resources/[EGRP-CarPacks]/ERGP-Highwaypatrol/stream/chp24pack/chpdurango.ytd b/resources/[EGRP-CarPacks]/ERGP-Highwaypatrol/stream/chp24pack/chpdurango.ytd
deleted file mode 100644
index 653707902..000000000
--- a/resources/[EGRP-CarPacks]/ERGP-Highwaypatrol/stream/chp24pack/chpdurango.ytd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e566008454ac6342d24f3c83ad0029bf6c6b08957dc5cc92998e6ed7edae4cfa
-size 9147448
diff --git a/resources/[EGRP-CarPacks]/ERGP-Highwaypatrol/stream/chp24pack/chpdurango_hi.yft b/resources/[EGRP-CarPacks]/ERGP-Highwaypatrol/stream/chp24pack/chpdurango_hi.yft
deleted file mode 100644
index 3042fa7e2..000000000
--- a/resources/[EGRP-CarPacks]/ERGP-Highwaypatrol/stream/chp24pack/chpdurango_hi.yft
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0e60b23ea2f5ac82370d395e992d90f25c6b0c90a81e4f9e91b42eb9178a228c
-size 10691183
diff --git a/resources/[ERS]/night_ers/callouts/plugins/callout_smoking_weed.lua b/resources/[ERS]/night_ers/callouts/plugins/callout_smoking_weed.lua
index fa7aca48c..d8d4df1f5 100644
--- a/resources/[ERS]/night_ers/callouts/plugins/callout_smoking_weed.lua
+++ b/resources/[ERS]/night_ers/callouts/plugins/callout_smoking_weed.lua
@@ -1,6 +1,6 @@
 Config.Callouts["smoking_weed"] = {
 
-    Enabled = true,
+    Enabled = false,
     CalloutName = "Reports of a person smoking weed",
     CalloutDescriptions = {
         "Investigate reports of a person smoking weed; locate the individual and assess the situation.",
diff --git a/resources/[ERS]/night_ers/config/config.lua b/resources/[ERS]/night_ers/config/config.lua
index 3181205a8..d0dee6ee8 100644
--- a/resources/[ERS]/night_ers/config/config.lua
+++ b/resources/[ERS]/night_ers/config/config.lua
@@ -747,7 +747,7 @@ Config = {
 
     --====================== ZONE CHANGE UI ======================--
 
-    EnableZoneChangeUI = true,
+    EnableZoneChangeUI = false,
     Zones = { 
         ['AIRP'] = "Los Santos International Airport", ['ALAMO'] = "Alamo Sea", ['ALTA'] = "Alta", ['ARMYB'] = "Fort Zancudo", ['BANHAMC'] = "Banham Canyon Dr", ['BANNING'] = "Banning", 
         ['BEACH'] = "Vespucci Beach", ['BHAMCA'] = "Banham Canyon", ['BRADP'] = "Braddock Pass", ['BRADT'] = "Braddock Tunnel", ['BURTON'] = "Burton", ['CALAFB'] = "Calafia Bridge", ['CANNY'] = "Raton Canyon", 
diff --git a/resources/scully_lawenforcement/.fxap b/resources/scully_lawenforcement/.fxap
index 1b4c8a43a..4e099a1fa 100644
Binary files a/resources/scully_lawenforcement/.fxap and b/resources/scully_lawenforcement/.fxap differ
diff --git a/resources/scully_lawenforcement/client/alerts.lua b/resources/scully_lawenforcement/client/alerts.lua
index eec3dc484..b9d911ed7 100644
Binary files a/resources/scully_lawenforcement/client/alerts.lua and b/resources/scully_lawenforcement/client/alerts.lua differ
diff --git a/resources/scully_lawenforcement/client/blockers.lua b/resources/scully_lawenforcement/client/blockers.lua
index bff38a5ad..4549220cc 100644
Binary files a/resources/scully_lawenforcement/client/blockers.lua and b/resources/scully_lawenforcement/client/blockers.lua differ
diff --git a/resources/scully_lawenforcement/client/events.lua b/resources/scully_lawenforcement/client/events.lua
index c3f7c03f8..fcd6df880 100644
Binary files a/resources/scully_lawenforcement/client/events.lua and b/resources/scully_lawenforcement/client/events.lua differ
diff --git a/resources/scully_lawenforcement/client/exports.lua b/resources/scully_lawenforcement/client/exports.lua
index 1026f152a..616645914 100644
Binary files a/resources/scully_lawenforcement/client/exports.lua and b/resources/scully_lawenforcement/client/exports.lua differ
diff --git a/resources/scully_lawenforcement/client/functions.lua b/resources/scully_lawenforcement/client/functions.lua
index 9fb3a73d0..47b51f939 100644
Binary files a/resources/scully_lawenforcement/client/functions.lua and b/resources/scully_lawenforcement/client/functions.lua differ
diff --git a/resources/scully_lawenforcement/client/main.lua b/resources/scully_lawenforcement/client/main.lua
index 80d3eb7dd..78dff9396 100644
Binary files a/resources/scully_lawenforcement/client/main.lua and b/resources/scully_lawenforcement/client/main.lua differ
diff --git a/resources/scully_lawenforcement/client/menu.lua b/resources/scully_lawenforcement/client/menu.lua
index 9a121f610..6c523b767 100644
Binary files a/resources/scully_lawenforcement/client/menu.lua and b/resources/scully_lawenforcement/client/menu.lua differ
diff --git a/resources/scully_lawenforcement/client/quickbinds.lua b/resources/scully_lawenforcement/client/quickbinds.lua
index 315f25b94..7c48db231 100644
Binary files a/resources/scully_lawenforcement/client/quickbinds.lua and b/resources/scully_lawenforcement/client/quickbinds.lua differ
diff --git a/resources/scully_lawenforcement/data/departments.lua b/resources/scully_lawenforcement/data/departments.lua
index eaf118c13..f6f07ce30 100644
--- a/resources/scully_lawenforcement/data/departments.lua
+++ b/resources/scully_lawenforcement/data/departments.lua
@@ -6,13 +6,19 @@ return {
             enable = true,
             sprite = 60,
             color = 38,
-            scale = 0.8
+            scale = 0.8,
+            custom = function(blip)
+                -- If you want to customize the blips further you can do that here.
+            end
         },
         dutyBlip = {
             sprite = 1,
             color = 57,
             scale = 0.8,
-            showCone = true
+            showCone = true,
+            custom = function(blip)
+                -- If you want to customize the blips further you can do that here.
+            end
         },
         locations = {
             vec3(440.46, -975.71, 30.68)
@@ -25,13 +31,19 @@ return {
             enable = true,
             sprite = 60,
             color = 31,
-            scale = 0.8
+            scale = 0.8,
+            custom = function(blip)
+                -- If you want to customize the blips further you can do that here.
+            end
         },
         dutyBlip = {
             sprite = 1,
             color = 57,
             scale = 0.8,
-            showCone = true
+            showCone = true,
+            custom = function(blip)
+                -- If you want to customize the blips further you can do that here.
+            end
         },
         locations = {
             vec3(1834.00, 3678.01, 34.18)
diff --git a/resources/scully_lawenforcement/data/loadouts.lua b/resources/scully_lawenforcement/data/loadouts.lua
index 5e57a50b3..d2348b168 100644
--- a/resources/scully_lawenforcement/data/loadouts.lua
+++ b/resources/scully_lawenforcement/data/loadouts.lua
@@ -16,75 +16,87 @@ return {
                 rotationOrder = 0
             }
         },
-        weapons = {
+        options = {
             ['Patrol'] = {
-                {
-                    weapon = `WEAPON_COMBATPISTOL`,
-                    components = {
-                        `COMPONENT_AT_PI_FLSH`
-                    }
-                },
-                {
-                    weapon = `WEAPON_STUNGUN`,
-                    components = {}
-                },
-                {
-                    weapon = `WEAPON_FLASHLIGHT`,
-                    components = {}
-                },
-                {
-                    weapon = `WEAPON_NIGHTSTICK`,
-                    components = {}
-                },
-                {
-                    weapon = `WEAPON_FLAREGUN`,
-                    components = {}
-                },
-                {
-                    weapon = `WEAPON_PUMPSHOTGUN`,
-                    components = {
-                        `COMPONENT_AT_AR_FLSH`
+                health = 200, -- Default health is 200 for MP peds.
+                armor = 100,
+                weapons = {
+                    {
+                        weapon = `WEAPON_COMBATPISTOL`,
+                        components = {
+                            `COMPONENT_AT_PI_FLSH`
+                        }
+                    },
+                    {
+                        weapon = `WEAPON_STUNGUN`,
+                        components = {}
+                    },
+                    {
+                        weapon = `WEAPON_FLASHLIGHT`,
+                        components = {}
+                    },
+                    {
+                        weapon = `WEAPON_NIGHTSTICK`,
+                        components = {}
+                    },
+                    {
+                        weapon = `WEAPON_FLAREGUN`,
+                        components = {}
+                    },
+                    {
+                        weapon = `WEAPON_PUMPSHOTGUN`,
+                        components = {
+                            `COMPONENT_AT_AR_FLSH`
+                        }
                     }
                 }
             },
             ['SWAT'] = {
-                {
-                    weapon = `WEAPON_COMBATPISTOL`,
-                    components = {
-                        `COMPONENT_AT_PI_FLSH`
+                health = 200, -- Default health is 200 for MP peds.
+                armor = 100,
+                weapons = {
+                    {
+                        weapon = `WEAPON_COMBATPISTOL`,
+                        components = {
+                            `COMPONENT_AT_PI_FLSH`
+                        }
+                    },
+                    {
+                        weapon = `WEAPON_SMG`,
+                        components = {
+                            `COMPONENT_AT_AR_FLSH`,
+                            `COMPONENT_SMG_CLIP_02`,
+                            `COMPONENT_AT_SCOPE_MACRO_02`,
+                        }
+                    },
+                    {
+                        weapon = `WEAPON_CARBINERIFLE`,
+                        components = {
+                            `COMPONENT_AT_AR_FLSH`,
+                            `COMPONENT_CARBINERIFLE_CLIP_02`,
+                            `COMPONENT_AT_SCOPE_MEDIUM`
+                        }
+                    },
+                    {
+                        weapon = `WEAPON_SNIPERRIFLE`,
+                        components = {}
                     }
-                },
-                {
-                    weapon = `WEAPON_SMG`,
-                    components = {
-                        `COMPONENT_AT_AR_FLSH`,
-                        `COMPONENT_SMG_CLIP_02`,
-                        `COMPONENT_AT_SCOPE_MACRO_02`,
-                    }
-                },
-                {
-                    weapon = `WEAPON_CARBINERIFLE`,
-                    components = {
-                        `COMPONENT_AT_AR_FLSH`,
-                        `COMPONENT_CARBINERIFLE_CLIP_02`,
-                        `COMPONENT_AT_SCOPE_MEDIUM`
-                    }
-                },
-                {
-                    weapon = `WEAPON_SNIPERRIFLE`,
-                    components = {}
                 }
             },
             ['Detective'] = {
-                {
-                    weapon = `WEAPON_COMBATPISTOL`,
-                    components = {
-                        `COMPONENT_AT_PI_FLSH`
+                health = 200, -- Default health is 200 for MP peds.
+                armor = 100,
+                weapons = {
+                    {
+                        weapon = `WEAPON_COMBATPISTOL`,
+                        components = {
+                            `COMPONENT_AT_PI_FLSH`
+                        }
+                    },
+                    {
+                        weapon = `WEAPON_FLASHLIGHT`,
+                        components = {}
                     }
-                },
-                {
-                    weapon = `WEAPON_FLASHLIGHT`,
-                    components = {}
                 }
             }
         }
@@ -106,75 +118,87 @@ return {
                 rotationOrder = 0
             }
         },
-        weapons = {
+        options = {
             ['Patrol'] = {
-                {
-                    weapon = `WEAPON_COMBATPISTOL`,
-                    components = {
-                        `COMPONENT_AT_PI_FLSH`
-                    }
-                },
-                {
-                    weapon = `WEAPON_STUNGUN`,
-                    components = {}
-                },
-                {
-                    weapon = `WEAPON_FLASHLIGHT`,
-                    components = {}
-                },
-                {
-                    weapon = `WEAPON_NIGHTSTICK`,
-                    components = {}
-                },
-                {
-                    weapon = `WEAPON_FLAREGUN`,
-                    components = {}
-                },
-                {
-                    weapon = `WEAPON_PUMPSHOTGUN`,
-                    components = {
-                        `COMPONENT_AT_AR_FLSH`
+                health = 200, -- Default health is 200 for MP peds.
+                armor = 100,
+                weapons = {
+                    {
+                        weapon = `WEAPON_COMBATPISTOL`,
+                        components = {
+                            `COMPONENT_AT_PI_FLSH`
+                        }
+                    },
+                    {
+                        weapon = `WEAPON_STUNGUN`,
+                        components = {}
+                    },
+                    {
+                        weapon = `WEAPON_FLASHLIGHT`,
+                        components = {}
+                    },
+                    {
+                        weapon = `WEAPON_NIGHTSTICK`,
+                        components = {}
+                    },
+                    {
+                        weapon = `WEAPON_FLAREGUN`,
+                        components = {}
+                    },
+                    {
+                        weapon = `WEAPON_PUMPSHOTGUN`,
+                        components = {
+                            `COMPONENT_AT_AR_FLSH`
+                        }
                     }
                 }
             },
-            ['SWAT'] = {
-                {
-                    weapon = `WEAPON_COMBATPISTOL`,
-                    components = {
-                        `COMPONENT_AT_PI_FLSH`
+            ['SRT'] = {
+                health = 200, -- Default health is 200 for MP peds.
+                armor = 100,
+                weapons = {
+                    {
+                        weapon = `WEAPON_COMBATPISTOL`,
+                        components = {
+                            `COMPONENT_AT_PI_FLSH`
+                        }
+                    },
+                    {
+                        weapon = `WEAPON_SMG`,
+                        components = {
+                            `COMPONENT_AT_AR_FLSH`,
+                            `COMPONENT_SMG_CLIP_02`,
+                            `COMPONENT_AT_SCOPE_MACRO_02`,
+                        }
+                    },
+                    {
+                        weapon = `WEAPON_CARBINERIFLE`,
+                        components = {
+                            `COMPONENT_AT_AR_FLSH`,
+                            `COMPONENT_CARBINERIFLE_CLIP_02`,
+                            `COMPONENT_AT_SCOPE_MEDIUM`
+                        }
+                    },
+                    {
+                        weapon = `WEAPON_SNIPERRIFLE`,
+                        components = {}
                     }
-                },
-                {
-                    weapon = `WEAPON_SMG`,
-                    components = {
-                        `COMPONENT_AT_AR_FLSH`,
-                        `COMPONENT_SMG_CLIP_02`,
-                        `COMPONENT_AT_SCOPE_MACRO_02`,
-                    }
-                },
-                {
-                    weapon = `WEAPON_CARBINERIFLE`,
-                    components = {
-                        `COMPONENT_AT_AR_FLSH`,
-                        `COMPONENT_CARBINERIFLE_CLIP_02`,
-                        `COMPONENT_AT_SCOPE_MEDIUM`
-                    }
-                },
-                {
-                    weapon = `WEAPON_SNIPERRIFLE`,
-                    components = {}
                 }
             },
             ['Detective'] = {
-                {
-                    weapon = `WEAPON_COMBATPISTOL`,
-                    components = {
-                        `COMPONENT_AT_PI_FLSH`
+                health = 200, -- Default health is 200 for MP peds.
+                armor = 100,
+                weapons = {
+                    {
+                        weapon = `WEAPON_COMBATPISTOL`,
+                        components = {
+                            `COMPONENT_AT_PI_FLSH`
+                        }
+                    },
+                    {
+                        weapon = `WEAPON_FLASHLIGHT`,
+                        components = {}
                     }
-                },
-                {
-                    weapon = `WEAPON_FLASHLIGHT`,
-                    components = {}
                 }
             }
         }
diff --git a/resources/scully_lawenforcement/modules/cache.lua b/resources/scully_lawenforcement/modules/cache.lua
index 3329880df..ee5df803f 100644
Binary files a/resources/scully_lawenforcement/modules/cache.lua and b/resources/scully_lawenforcement/modules/cache.lua differ
diff --git a/resources/scully_lawenforcement/modules/db.lua b/resources/scully_lawenforcement/modules/db.lua
index 9d0b32d09..a3f73d51e 100644
Binary files a/resources/scully_lawenforcement/modules/db.lua and b/resources/scully_lawenforcement/modules/db.lua differ
diff --git a/resources/scully_lawenforcement/modules/logger.lua b/resources/scully_lawenforcement/modules/logger.lua
index 4313872fb..81d6bdf48 100644
Binary files a/resources/scully_lawenforcement/modules/logger.lua and b/resources/scully_lawenforcement/modules/logger.lua differ
diff --git a/resources/scully_lawenforcement/modules/menubuilder.lua b/resources/scully_lawenforcement/modules/menubuilder.lua
index 37aa9b781..8e56fbc92 100644
Binary files a/resources/scully_lawenforcement/modules/menubuilder.lua and b/resources/scully_lawenforcement/modules/menubuilder.lua differ
diff --git a/resources/scully_lawenforcement/modules/sync.lua b/resources/scully_lawenforcement/modules/sync.lua
index 7c80bc10c..4f2d81419 100644
Binary files a/resources/scully_lawenforcement/modules/sync.lua and b/resources/scully_lawenforcement/modules/sync.lua differ
diff --git a/resources/scully_lawenforcement/modules/ui.lua b/resources/scully_lawenforcement/modules/ui.lua
index db450b48d..ab295696d 100644
Binary files a/resources/scully_lawenforcement/modules/ui.lua and b/resources/scully_lawenforcement/modules/ui.lua differ
diff --git a/resources/scully_lawenforcement/modules/utils.lua b/resources/scully_lawenforcement/modules/utils.lua
index 84881dcdd..3957d5176 100644
Binary files a/resources/scully_lawenforcement/modules/utils.lua and b/resources/scully_lawenforcement/modules/utils.lua differ
diff --git a/resources/scully_lawenforcement/server/cad.lua b/resources/scully_lawenforcement/server/cad.lua
index 5306648fc..3e65162df 100644
Binary files a/resources/scully_lawenforcement/server/cad.lua and b/resources/scully_lawenforcement/server/cad.lua differ
diff --git a/resources/scully_lawenforcement/server/exports.lua b/resources/scully_lawenforcement/server/exports.lua
index 3de60fcdb..06ec9e887 100644
Binary files a/resources/scully_lawenforcement/server/exports.lua and b/resources/scully_lawenforcement/server/exports.lua differ
diff --git a/resources/scully_lawenforcement/server/main.lua b/resources/scully_lawenforcement/server/main.lua
index efbe9661a..14ffe3a5d 100644
Binary files a/resources/scully_lawenforcement/server/main.lua and b/resources/scully_lawenforcement/server/main.lua differ
diff --git a/resources/scully_lawenforcement/server/version_check.lua b/resources/scully_lawenforcement/server/version_check.lua
index ff7f16f17..9ecf753dd 100644
Binary files a/resources/scully_lawenforcement/server/version_check.lua and b/resources/scully_lawenforcement/server/version_check.lua differ
diff --git a/resources/scully_lawenforcement/stream/[weapons]/w_me_pliers_01.ydr b/resources/scully_lawenforcement/stream/[weapons]/w_me_pliers_01.ydr
index 1c53ca6e3..94206c4d9 100644
--- a/resources/scully_lawenforcement/stream/[weapons]/w_me_pliers_01.ydr
+++ b/resources/scully_lawenforcement/stream/[weapons]/w_me_pliers_01.ydr
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea05f6a9e99f89e59b4b5ef16be7fbf2dae22ffcd41f27e79f100ddeb2391cc5
+oid sha256:dc07303d04d2cf636acb3b1139d20e5e7c81d4fdefe41177f3dbe126df463b9a
 size 123656
diff --git a/resources/scully_radio2/config.lua b/resources/scully_radio2/config.lua
index 39542586a..796031f8c 100644
--- a/resources/scully_radio2/config.lua
+++ b/resources/scully_radio2/config.lua
@@ -1,5 +1,5 @@
 Scully = {
-    KVPHandle = 'G8YVvvcvfccxD', -- Change this to something unique such as your server name.
+    KVPHandle = 'Elite Gaming', -- Change this to something unique such as your server name.
     RadioColour = 'default', -- Options are default, blue, brown, cherry, coral, cyan, green, mint, orange, pink, purple, red, white and yellow
     AllowColours = true, -- Disable if you don't want people to be able to change their radio colour in-game
     ColourCommand = 'rcolor', -- Set to '' if you don't want to allow changing with a command, command is /rcolour 1-11
diff --git a/resources/ulc/config.lua b/resources/ulc/config.lua
index bfc2ef949..7a8d26779 100644
--- a/resources/ulc/config.lua
+++ b/resources/ulc/config.lua
@@ -413,17 +413,6 @@ Config = {
         "lapd14charger",      
         "lapdfpis", 
         "metrofpiu",  
-        "             ", 
-        "             ",     
-        "             ", 
-        "             ",   
-        "             ", 
-        "             ",     
-        "             ", 
-        "             ",  
-        "             ", 
-        "             ",     
-        "             ", 
         "             "     
         
 
diff --git a/server.cfg b/server.cfg
index e14af33a8..f30370c61 100644
--- a/server.cfg
+++ b/server.cfg
@@ -196,7 +196,7 @@ ensure ctrunk
 ensure MAXINGspeedlimiter
 ensure LRX_HOLLYWOOD
 ensure rhud
-ensure 
+ensure ulc
 ensure 
 ensure 
 ensure 
@@ -572,39 +572,28 @@ ensure taser10addon
 
 #[-----Map Add-On-----]
 ensure ad2
-//ensure SandyShores-Hospital
 ensure Flywheels
 ensure casinointerior
-//ensure Hill-Mansion
 ensure Burgershot
-//ensure bob74_ipl
 ensure online_interiors
 ensure Pablito-Taco
 ensure Pablito-Delperro
 ensure FiveM-Snail
 ensure bob74_ipl
 ensure GasPump-Protection
-//ensure SS-Racetrack
-//ensure Custom-Racetrack
 ensure KartTrackLSIA
 ensure xnArena
 ensure GroveStreet-House
 ensure Hostage-House
-//ensure Benefactor_Dealership
-ensure Bean-Machine-LS
 ensure ONeils-Farm
 ensure Spawn-Map
 ensure PaletoBay-Secure
 ensure Zancudo-Training
 ensure Weed-Clinic
-ensure Submarine-MLO
 ensure LifeInvader-MLO
 ensure Paleto-Station-Enchancement
 ensure Dynasty8
-ensure 247-BricksSkin
-ensure AP-Autos
 ensure Dealership-PDM
-//ensure Cubepark-Garage
 ensure Davis-RepairShop
 ensure Blackrose-Food
 ensure Weazel-News
@@ -616,8 +605,6 @@ ensure Pillbox-Hospital
 ensure SAHP-PD
 ensure int_prisonfull
 ensure prisonprops
-ensure Bahama-Mamas
-ensure bahamas_props_addons
 ensure nve_props
 ensure Bean-Machine-Hills
 ensure PaletoFire
@@ -628,13 +615,9 @@ ensure ballasint
 ensure vagosint
 ensure patoche_paleto_airport
 ensure gabz_diner
-ensure fivem_sandy_apartments
 ensure vespucci_pd
 ensure brofx_10
 ensure paletocityhall
-ensure Legion-CourtHouse
-ensure Legion-Square-Underground
-ensure patoche_cyberbar
 ensure np-tuners
 ensure Map_PaletoSO
 ensure paletohospital
@@ -643,7 +626,6 @@ ensure gas_station
 ensure warehouse
 ensure beachtower
 ensure sc1_29_motel_fivem
-
 ensure iak_DrugFarm
 ensure Giant_BarTheDrink
 ensure paletocityhall
@@ -656,7 +638,6 @@ ensure vinewoodfloorLSPD
 ensure vinewoodfloorMain
 ensure vinewoodfloorStairs
 ensure vinewoodfloorUG
-
 ensure Map_SandyLTD
 ensure brofx_06
 ensure smokey_paletobarak4
@@ -677,7 +658,6 @@ ensure yellowjack
 ensure gnd_mechanics
 ensure lafa2k_finalfantasyxv
 ensure hills
-ensure avp_harmony_house
 ensure beachusko
 ensure beachuskogula
 ensure vinewoodapa
@@ -686,29 +666,22 @@ ensure brnx_bayviewlodge
 ensure dons_vb_lifeguard
 ensure JM-MotorbikeTrainingCourse
 ensure ult-vinyl-bar
-ensure western_sandy_sheriff
-ensure western_sandy_hospital
-ensure patoche_wolf_camp
 ensure patoche_littlehouse
 ensure itzmapz-vinewoodvilla-01
 ensure iak_police_training
 ensure dip_deerdiner
-
 ensure food-park
 ensure jd-harmonysheriff
 ensure ja_ls_golfclub
 ensure mrw_minigolf
 ensure ed_rockfordh02
 ensure gcom_chhp_standalone
-ensure cfx_chuz_sandy_shores_boat_house
 ensure brofx_farmhouse_02
 ensure ShootingRange
 ensure hane_hpub
 ensure hane_hpub_meta
 ensure hane_hpub_meta2
 ensure lasdinblainecounty
-
-
 ensure nxp_ambulance_central
 ensure 
 ensure hn_hpub_anim_paints
@@ -720,21 +693,18 @@ ensure union_families
 ensure mcdonaldbeach
 ensure it_cf
 ensure pablito_lucky_plucker
-ensure lafitness
 ensure Jacks_Paradise_Resort
 ensure ef_lsc
 ensure mexcafe
 ensure pier_cafe
 ensure moditMotel
-ensure dons_chbcso
-ensure smokey_irishpub
 ensure marx_house1
 ensure mystic
 ensure RichMan_Villa
 ensure Lost-MC
 ensure ed_white_mansion
 ensure int_mphouse01
-ensure 
+ensure LAPDMLO
 ensure 
 ensure 
 ensure