diff --git a/changelog.md b/changelog.md
index 15856865..2235cd6b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -8,6 +8,8 @@
 * **[Squadrons]** Ability to define a livery-set for each squadron from which Retribution will randomly choose during mission generation
 * **[Modding]** Updated support for F/A-18E/F/G mod version 2.2.5
 * **[Modding]** Added VSN F-106 Delta Dart mod support (v2.9.4.101)
+* **[Modding]** Added VSN EA-6B Prowler mod support (v2.9.4.102)
+* **[Modding]** Added tripod3 Cold War assets mod support (v1.0)
 * **[Campaign Setup]** Allow adjustments to naval TGOs (except carriers) on turn 0
 * **[Campaign Design]** Ability to configure specific carrier names & types in campaign's yaml file 
 * **[Mission Generation]** Ability to inject custom kneeboards
diff --git a/game/factions/faction.py b/game/factions/faction.py
index 227face3..54fee4c3 100644
--- a/game/factions/faction.py
+++ b/game/factions/faction.py
@@ -545,6 +545,12 @@ class Faction:
             self.remove_preset("LvS-103 Rb103A Mobile")
             self.remove_preset("LvS-103 Rb103B")
             self.remove_preset("LvS-103 Rb103B Mobile")
+        if not mod_settings.coldwarassets:
+            self.remove_aircraft("B_47")
+            self.remove_aircraft("Tu-4K")
+            self.remove_aircraft("Tu-16")
+            self.remove_aircraft("tu_22D")
+            self.remove_aircraft("tu_22KD")
         # SWPack
         if not mod_settings.SWPack:
             self.remove_aircraft("AWINGA")
diff --git a/game/radio/radios.py b/game/radio/radios.py
index 85d67d0f..d2cb3eea 100644
--- a/game/radio/radios.py
+++ b/game/radio/radios.py
@@ -331,6 +331,11 @@ RADIOS: List[Radio] = [
             RadioRange(MHz(30), MHz(88), kHz(25), Modulation.AM),
         ),
     ),
+    # F-86 Sabre
+    Radio(
+        "AN/ARC-27",
+        (RadioRange(MHz(225), MHz(400), kHz(100), Modulation.AM),),
+    ),
 ]
 
 
diff --git a/game/theater/start_generator.py b/game/theater/start_generator.py
index ac78996c..d1b512b1 100644
--- a/game/theater/start_generator.py
+++ b/game/theater/start_generator.py
@@ -96,6 +96,7 @@ class ModSettings:
     ov10a_bronco: bool = False
     spanishnavypack: bool = False
     swedishmilitaryassetspack: bool = False
+    coldwarassets: bool = False
     SWPack: bool = False
 
 
diff --git a/game/theater/theatergroundobject.py b/game/theater/theatergroundobject.py
index 2f8d3bbf..b56cd207 100644
--- a/game/theater/theatergroundobject.py
+++ b/game/theater/theatergroundobject.py
@@ -376,7 +376,7 @@ class NavalGroundObject(TheaterGroundObject, ABC):
 
     @property
     def purchasable(self) -> bool:
-        return False
+        return self.control_point.coalition.game.turn == 0
 
     @property
     def is_iads(self) -> bool:
@@ -460,7 +460,7 @@ class MissileSiteGroundObject(TheaterGroundObject):
 
     @property
     def purchasable(self) -> bool:
-        return False
+        return self.control_point.coalition.game.turn == 0
 
     @property
     def should_head_to_conflict(self) -> bool:
@@ -501,7 +501,7 @@ class CoastalSiteGroundObject(TheaterGroundObject):
 
     @property
     def purchasable(self) -> bool:
-        return False
+        return self.control_point.coalition.game.turn == 0
 
     @property
     def should_head_to_conflict(self) -> bool:
diff --git a/game/theater/theaterloader.py b/game/theater/theaterloader.py
index b57b6306..087dee0d 100644
--- a/game/theater/theaterloader.py
+++ b/game/theater/theaterloader.py
@@ -18,6 +18,7 @@ from dcs.terrain import (
     TheChannel,
     Sinai,
     Kola,
+    Afghanistan,
 )
 
 from .conflicttheater import ConflictTheater
@@ -36,6 +37,7 @@ ALL_TERRAINS = [
     Syria(),
     Sinai(),
     Kola(),
+    Afghanistan(),
 ]
 
 TERRAINS_BY_NAME = {t.name: t for t in ALL_TERRAINS}
diff --git a/pydcs_extensions/__init__.py b/pydcs_extensions/__init__.py
index 97a3235a..08731b9c 100644
--- a/pydcs_extensions/__init__.py
+++ b/pydcs_extensions/__init__.py
@@ -29,6 +29,7 @@ from .su15 import *
 from .su30 import *
 from .su57 import *
 from .swedishmilitaryassetspack import *
+from .coldwarassets import *
 from .uh60l import *
 
 
diff --git a/pydcs_extensions/a4ec/a4ec.py b/pydcs_extensions/a4ec/a4ec.py
index 6a20eaaa..515eff43 100644
--- a/pydcs_extensions/a4ec/a4ec.py
+++ b/pydcs_extensions/a4ec/a4ec.py
@@ -940,63 +940,64 @@ class A_4E_C(PlaneType):
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             1,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             1,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             1,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             1,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             1,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             1,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             1,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             1,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = (
             1,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             1,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             1,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = (
             1,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM,
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             1,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             1,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             1,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         LAU3_WP61 = (1, Weapons.LAU3_WP61)
         LAU3_WP1B = (1, Weapons.LAU3_WP1B)
@@ -1069,15 +1070,15 @@ class A_4E_C(PlaneType):
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = (
             2,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             2,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             2,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
         _2_x_LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts__M156__Wht_Phos__TER__ = (
             2,
@@ -1093,15 +1094,15 @@ class A_4E_C(PlaneType):
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM,
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
         _2_x_LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts__M156__Wht_Phos__TER__ = (
             2,
@@ -1117,35 +1118,35 @@ class A_4E_C(PlaneType):
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         _2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE__TER__ = (
             2,
@@ -1181,7 +1182,7 @@ class A_4E_C(PlaneType):
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             2,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         _2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_MK_71__HE_FRAG__TER__ = (
             2,
@@ -1329,15 +1330,15 @@ class A_4E_C(PlaneType):
         Fuel_Tank_150_gallons__EMPTY_ = (3, WeaponsA4EC.Fuel_Tank_150_gallons__EMPTY_)
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = (
             3,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             3,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             3,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
         _2_x_LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts__M156__Wht_Phos__TER_ = (
             3,
@@ -1365,15 +1366,15 @@ class A_4E_C(PlaneType):
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM,
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
         _2_x_LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts__M156__Wht_Phos__TER_ = (
             3,
@@ -1405,43 +1406,43 @@ class A_4E_C(PlaneType):
         LAU3_WP1B = (3, Weapons.LAU3_WP1B)
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             3,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             3,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         _2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE__TER_ = (
             3,
@@ -1509,7 +1510,7 @@ class A_4E_C(PlaneType):
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             3,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         _2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_MK_71__HE_FRAG__TER_ = (
             3,
@@ -1706,15 +1707,15 @@ class A_4E_C(PlaneType):
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = (
             4,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             4,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             4,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
         _2_x_LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts__M156__Wht_Phos__TER___ = (
             4,
@@ -1730,15 +1731,15 @@ class A_4E_C(PlaneType):
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = (
             4,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM,
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             4,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             4,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
         _2_x_LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts__M156__Wht_Phos__TER___ = (
             4,
@@ -1754,35 +1755,35 @@ class A_4E_C(PlaneType):
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             4,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             4,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             4,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             4,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             4,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             4,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             4,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             4,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         _2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE__TER___ = (
             4,
@@ -1818,7 +1819,7 @@ class A_4E_C(PlaneType):
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             4,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         _2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_MK_71__HE_FRAG__TER___ = (
             4,
@@ -1984,63 +1985,63 @@ class A_4E_C(PlaneType):
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = (
             5,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             5,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             5,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM,
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             5,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         LAU3_WP61 = (5, Weapons.LAU3_WP61)
         LAU3_WP1B = (5, Weapons.LAU3_WP1B)
diff --git a/pydcs_extensions/a6a/a6a.py b/pydcs_extensions/a6a/a6a.py
index 7ebd2861..e6a018e4 100644
--- a/pydcs_extensions/a6a/a6a.py
+++ b/pydcs_extensions/a6a/a6a.py
@@ -122,27 +122,27 @@ class VSN_A6A(PlaneType):
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             1,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             1,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             1,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             1,
-            Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             1,
-            Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             1,
-            Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             1,
@@ -171,23 +171,23 @@ class VSN_A6A(PlaneType):
         )
         BRU_33_with_1_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             1,
-            Weapons.BRU_33_with_1_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.BRU_33_1_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_33_with_1_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             1,
-            Weapons.BRU_33_with_1_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_1_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_1_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             1,
-            Weapons.BRU_33_with_1_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.BRU_33_1_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         BRU_33_with_1_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             1,
-            Weapons.BRU_33_with_1_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_1_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             1,
-            Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
 
     class Pylon2:
@@ -282,27 +282,27 @@ class VSN_A6A(PlaneType):
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             2,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             2,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             2,
-            Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             2,
-            Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             2,
-            Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             2,
@@ -327,23 +327,23 @@ class VSN_A6A(PlaneType):
         )
         BRU_33_with_1_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             2,
-            Weapons.BRU_33_with_1_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.BRU_33_1_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_33_with_1_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             2,
-            Weapons.BRU_33_with_1_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_1_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_1_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             2,
-            Weapons.BRU_33_with_1_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.BRU_33_1_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         BRU_33_with_1_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             2,
-            Weapons.BRU_33_with_1_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_1_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             2,
-            Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
 
     class Pylon3:
@@ -492,27 +492,27 @@ class VSN_A6A(PlaneType):
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             4,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             4,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             4,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             4,
-            Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             4,
-            Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             4,
-            Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             4,
@@ -537,23 +537,23 @@ class VSN_A6A(PlaneType):
         )
         BRU_33_with_1_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             4,
-            Weapons.BRU_33_with_1_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.BRU_33_1_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_33_with_1_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             4,
-            Weapons.BRU_33_with_1_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_1_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_1_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             4,
-            Weapons.BRU_33_with_1_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.BRU_33_1_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         BRU_33_with_1_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             4,
-            Weapons.BRU_33_with_1_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_1_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             4,
-            Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
 
     class Pylon5:
@@ -639,27 +639,27 @@ class VSN_A6A(PlaneType):
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             5,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             5,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             5,
-            Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             5,
-            Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             5,
-            Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             5,
@@ -688,23 +688,23 @@ class VSN_A6A(PlaneType):
         )
         BRU_33_with_1_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             5,
-            Weapons.BRU_33_with_1_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.BRU_33_1_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_33_with_1_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             5,
-            Weapons.BRU_33_with_1_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_1_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_1_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             5,
-            Weapons.BRU_33_with_1_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.BRU_33_1_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         BRU_33_with_1_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             5,
-            Weapons.BRU_33_with_1_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_1_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             5,
-            Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
 
     pylons: Set[int] = {1, 2, 3, 4, 5}
diff --git a/pydcs_extensions/a7e/a7e.py b/pydcs_extensions/a7e/a7e.py
index 1999b03d..189af2d4 100644
--- a/pydcs_extensions/a7e/a7e.py
+++ b/pydcs_extensions/a7e/a7e.py
@@ -578,27 +578,27 @@ class A_7E(PlaneType):
         LAU3_HE5 = (1, Weapons.LAU3_HE5)
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             1,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             1,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             1,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             1,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             1,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             1,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_42A___2_x_LAU_61___19_2_75__rockets_M151_HE = (
             1,
@@ -769,27 +769,27 @@ class A_7E(PlaneType):
         LAU3_HE5 = (2, Weapons.LAU3_HE5)
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             2,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             2,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_42A___2_x_LAU_61___19_2_75__rockets_M151_HE = (
             2,
@@ -901,27 +901,27 @@ class A_7E(PlaneType):
         LAU3_HE5 = (3, Weapons.LAU3_HE5)
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             3,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             3,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_42A___2_x_LAU_61___19_2_75__rockets_M151_HE = (
             3,
@@ -1032,27 +1032,27 @@ class A_7E(PlaneType):
         LAU3_HE5 = (6, Weapons.LAU3_HE5)
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             6,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             6,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             6,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             6,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             6,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             6,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_42A___2_x_LAU_61___19_2_75__rockets_M151_HE_ = (
             6,
@@ -1188,27 +1188,27 @@ class A_7E(PlaneType):
         LAU3_HE5 = (7, Weapons.LAU3_HE5)
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             7,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             7,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             7,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             7,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             7,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             7,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_42A___2_x_LAU_61___19_2_75__rockets_M151_HE_ = (
             7,
@@ -1350,27 +1350,27 @@ class A_7E(PlaneType):
         LAU3_HE5 = (8, Weapons.LAU3_HE5)
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             8,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             8,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             8,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             8,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             8,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             8,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_42A___2_x_LAU_61___19_2_75__rockets_M151_HE_ = (
             8,
diff --git a/pydcs_extensions/coldwarassets/__init__.py b/pydcs_extensions/coldwarassets/__init__.py
new file mode 100644
index 00000000..0193b8d0
--- /dev/null
+++ b/pydcs_extensions/coldwarassets/__init__.py
@@ -0,0 +1 @@
+from .coldwarassets import *
diff --git a/pydcs_extensions/coldwarassets/coldwarassets.py b/pydcs_extensions/coldwarassets/coldwarassets.py
new file mode 100644
index 00000000..463212c5
--- /dev/null
+++ b/pydcs_extensions/coldwarassets/coldwarassets.py
@@ -0,0 +1,374 @@
+# Requires Cold War assets mod (ex Tu-16) v1.0 by tripod3:
+# https://forum.dcs.world/topic/350021-cold-war-assets-mod-ex-tu-16-v-10/
+#
+from typing import Any, Dict, Set
+
+from dcs import task
+from dcs.planes import PlaneType
+from dcs.weapons_data import Weapons
+
+from game.modsupport import planemod
+from pydcs_extensions.weapon_injector import inject_weapons
+
+
+class WeaponsColdWarAssets:
+    B29_AN_M57_10 = {
+        "clsid": "B29_AN_M57_10",
+        "name": "10 x AN-M57 - 250lb GP Bombs LD",
+        "weight": 1185.462692,
+    }
+    B29_AN_M57_20 = {
+        "clsid": "B29_AN_M57_20",
+        "name": "20 x AN-M57 - 250lb GP Bombs LD",
+        "weight": 2370.925384,
+    }
+    B29_AN_M64_4 = {
+        "clsid": "B29_AN_M64_4",
+        "name": "4 x AN-M64 - 500lb GP Bombs LD",
+        "weight": 995.52557792,
+    }
+    B29_AN_M64_5 = {
+        "clsid": "B29_AN_M64_5",
+        "name": "5 x AN-M64 - 500lb GP Bombs LD",
+        "weight": 1244.4069724,
+    }
+    B29_AN_M64_6 = {
+        "clsid": "B29_AN_M64_6",
+        "name": "6 x AN-M64 - 500lb GP Bombs LD",
+        "weight": 1493.28836688,
+    }
+    B29_AN_M64_8 = {
+        "clsid": "B29_AN_M64_8",
+        "name": "8 x AN-M64 - 500lb GP Bombs LD",
+        "weight": 1991.05115584,
+    }
+    B29_AN_M65_2 = {
+        "clsid": "B29_AN_M65_2",
+        "name": "2 x AN-M65 - 1000lb GP Bombs LD",
+        "weight": 965.243776,
+    }
+    B29_AN_M65_3 = {
+        "clsid": "B29_AN_M65_3",
+        "name": "3 x AN-M65 - 1000lb GP Bombs LD",
+        "weight": 1447.865664,
+    }
+    B29_AN_M65_4 = {
+        "clsid": "B29_AN_M65_4",
+        "name": "4 x AN-M65 - 1000lb GP Bombs LD",
+        "weight": 1930.487552,
+    }
+    B29_AN_M65_6 = {
+        "clsid": "B29_AN_M65_6",
+        "name": "6 x AN-M65 - 1000lb GP Bombs LD",
+        "weight": 2895.731328,
+    }
+    B29_AN_M66_1 = {
+        "clsid": "B29_AN_M66_1",
+        "name": "1 x AN-M66 - 2000lb GP Bombs LD",
+        "weight": 958.5306144,
+    }
+    B29_AN_M66_2 = {
+        "clsid": "B29_AN_M66_2",
+        "name": "2 x AN-M66 - 2000lb GP Bombs LD",
+        "weight": 1917.0612288,
+    }
+    B29_M19_10 = {
+        "clsid": "B29_M19_10",
+        "name": "10 x M19 - 38 x AN-M69, 500lb CBU with incendiary submunitions",
+        "weight": 1973.1252,
+    }
+    B29_M19_6 = {
+        "clsid": "B29_M19_6",
+        "name": "6 x M19 - 38 x AN-M69, 500lb CBU with incendiary submunitions",
+        "weight": 1183.87512,
+    }
+    FAB_3000_M54 = {"clsid": "{FAB_3000_tu_22}", "name": "FAB-3000 M54", "weight": 9400}
+    FAB_9000_M54 = {"clsid": "{FAB_9000_tu_22}", "name": "FAB-9000 M54", "weight": 9400}
+    GAM_63_RASCAL = {
+        "clsid": "{B_29_RASCALARM}",
+        "name": "GAM-63 RASCAL",
+        "weight": 2400,
+    }
+    Kh_22MA = {"clsid": "{Tu_22_Kh22PSI}", "name": "Kh-22MA", "weight": 2400}
+    Kh_22P__Passive_seeker_ = {
+        "clsid": "{TU_22_KH22P}",
+        "name": "Kh-22P (Passive seeker)",
+        "weight": 1450,
+    }
+    KSR5P__Passive_seeker_ = {
+        "clsid": "{TU_16_KSR5ARM}",
+        "name": "KSR5P (Passive seeker)",
+        "weight": 1450,
+    }
+    KSR_2 = {"clsid": "{TU_16_KSR2}", "name": "KSR-2", "weight": 1160}
+    KSR_2_086__Passive_seeker_ = {
+        "clsid": "{TU_16_KSR2ARM}",
+        "name": "KSR-2.086 (Passive seeker)",
+        "weight": 1450,
+    }
+    KSR_5 = {"clsid": "{TU_16_KSR5}", "name": "KSR-5", "weight": 1450}
+    KS_1 = {"clsid": "{Tu4_KS_1}", "name": "KS-1", "weight": 1160}
+    KS_1_late = {"clsid": "{Tu16_KS_1}", "name": "KS-1 late", "weight": 1160}
+
+
+inject_weapons(WeaponsColdWarAssets)
+
+
+@planemod
+class B_47(PlaneType):
+    id = "B_47"
+    height = 10.36
+    width = 33
+    length = 34.8
+    fuel_max = 25000
+    max_speed = 1044
+    chaff = 120
+    flare = 120
+    charge_total = 240
+    chaff_charge_size = 1
+    flare_charge_size = 1
+    eplrs = True
+
+    property_defaults: Dict[str, Any] = {}
+
+    livery_name = "B_47"  # from type
+
+    class Pylon1:
+        GAM_63_RASCAL = (1, WeaponsColdWarAssets.GAM_63_RASCAL)
+
+    pylons: Set[int] = {1}
+
+    tasks = [
+        task.AntishipStrike,
+        task.GroundAttack,
+        task.PinpointStrike,
+        task.RunwayAttack,
+        task.SEAD,
+        task.CAS,
+    ]
+    task_default = task.AntishipStrike
+
+
+@planemod
+class Tu_4K(PlaneType):
+    id = "Tu-4K"
+    height = 8.46
+    width = 43.1
+    length = 30.18
+    fuel_max = 22371
+    max_speed = 558
+    radio_frequency = 127.5
+
+    property_defaults: Dict[str, Any] = {
+        "Belly_Bay_Door": False,
+    }
+
+    class Properties:
+        class Belly_Bay_Door:
+            id = "Belly Bay Door"
+
+    livery_name = "TU-4K"  # from type
+
+    class Pylon1:
+        KS_1 = (1, WeaponsColdWarAssets.KS_1)
+
+    class Pylon2:
+        KS_1 = (2, WeaponsColdWarAssets.KS_1)
+
+    pylons: Set[int] = {1, 2}
+
+    tasks = [task.GroundAttack, task.RunwayAttack, task.AntishipStrike]
+    task_default = task.RunwayAttack
+
+
+@planemod
+class Tu_16(PlaneType):
+    id = "Tu-16"
+    height = 10.36
+    width = 33
+    length = 34.8
+    fuel_max = 25000
+    max_speed = 1044
+    chaff = 120
+    flare = 120
+    charge_total = 240
+    chaff_charge_size = 1
+    flare_charge_size = 1
+    eplrs = True
+
+    property_defaults: Dict[str, Any] = {}
+
+    livery_name = "TU-16"  # from type
+
+    class Pylon1:
+        KS_1_late = (1, WeaponsColdWarAssets.KS_1_late)
+        KSR_2 = (1, WeaponsColdWarAssets.KSR_2)
+        KSR_2_086__Passive_seeker_ = (
+            1,
+            WeaponsColdWarAssets.KSR_2_086__Passive_seeker_,
+        )
+        KSR5P__Passive_seeker_ = (1, WeaponsColdWarAssets.KSR5P__Passive_seeker_)
+        KSR_5 = (1, WeaponsColdWarAssets.KSR_5)
+
+    class Pylon2:
+        FAB_3000_M54 = (2, WeaponsColdWarAssets.FAB_3000_M54)
+        FAB_9000_M54 = (2, WeaponsColdWarAssets.FAB_9000_M54)
+
+    # ERRR <CLEAN>
+
+    class Pylon3:
+        _33_x_FAB_250___250kg_GP_Bombs_LD = (
+            3,
+            Weapons._33_x_FAB_250___250kg_GP_Bombs_LD,
+        )
+
+    # ERRR <CLEAN>
+
+    class Pylon4:
+        KS_1_late = (4, WeaponsColdWarAssets.KS_1_late)
+        KSR_2 = (4, WeaponsColdWarAssets.KSR_2)
+        KSR_2_086__Passive_seeker_ = (
+            4,
+            WeaponsColdWarAssets.KSR_2_086__Passive_seeker_,
+        )
+        KSR5P__Passive_seeker_ = (4, WeaponsColdWarAssets.KSR5P__Passive_seeker_)
+        KSR_5 = (4, WeaponsColdWarAssets.KSR_5)
+
+    pylons: Set[int] = {1, 2, 3, 4}
+
+    tasks = [
+        task.AntishipStrike,
+        task.GroundAttack,
+        task.PinpointStrike,
+        task.RunwayAttack,
+        task.SEAD,
+        task.CAS,
+    ]
+    task_default = task.AntishipStrike
+
+
+@planemod
+class tu_22D(PlaneType):
+    id = "tu_22D"
+    height = 10.13
+    width = 23.17
+    length = 41.6
+    fuel_max = 42500
+    max_speed = 1509.84
+    chaff = 45
+    flare = -0
+    charge_total = 45
+    chaff_charge_size = 1
+    flare_charge_size = 1
+
+    livery_name = "TU_22D"  # from type
+
+    class Pylon1:
+        FAB_3000_M54 = (1, WeaponsColdWarAssets.FAB_3000_M54)
+        FAB_9000_M54 = (1, WeaponsColdWarAssets.FAB_9000_M54)
+        _6_x_FAB_1500_M_54___1500kg_GP_Bombs_LD = (
+            1,
+            Weapons._6_x_FAB_1500_M_54___1500kg_GP_Bombs_LD,
+        )
+        MBD3_U2T_with_2_x_FAB_1500_M_54___1500kg_GP_Bombs_LD = (
+            1,
+            Weapons.MBD3_U2T_with_2_x_FAB_1500_M_54___1500kg_GP_Bombs_LD,
+        )
+        MBD3_U6_68_with_6_x_FAB_500_M_62___500kg_GP_Bombs_LD = (
+            1,
+            Weapons.MBD3_U6_68_with_6_x_FAB_500_M_62___500kg_GP_Bombs_LD,
+        )
+        RN_24___470kg__nuclear_bomb__free_fall = (
+            1,
+            Weapons.RN_24___470kg__nuclear_bomb__free_fall,
+        )
+        RN_28___260_kg__nuclear_bomb__free_fall = (
+            1,
+            Weapons.RN_28___260_kg__nuclear_bomb__free_fall,
+        )
+
+    # ERRR <CLEAN>
+
+    class Pylon2:
+        _33_x_FAB_250___250kg_GP_Bombs_LD = (
+            2,
+            Weapons._33_x_FAB_250___250kg_GP_Bombs_LD,
+        )
+
+    # ERRR <CLEAN>
+
+    pylons: Set[int] = {1, 2}
+
+    tasks = [
+        task.Reconnaissance,
+        task.GroundAttack,
+        task.CAS,
+        task.RunwayAttack,
+        task.AntishipStrike,
+        task.PinpointStrike,
+    ]
+    task_default = task.GroundAttack
+
+
+@planemod
+class tu_22KD(PlaneType):
+    id = "tu_22KD"
+    height = 10.13
+    width = 23.17
+    length = 41.6
+    fuel_max = 42500
+    max_speed = 1509.84
+    chaff = 45
+    flare = -0
+    charge_total = 45
+    chaff_charge_size = 1
+    flare_charge_size = 1
+
+    livery_name = "TU_22KD"  # from type
+
+    class Pylon1:
+        Kh_22__AS_4_Kitchen____1000kg__AShM__IN__Act_Pas_Rdr = (
+            1,
+            Weapons.Kh_22__AS_4_Kitchen____1000kg__AShM__IN__Act_Pas_Rdr,
+        )
+        Kh_22MA = (1, WeaponsColdWarAssets.Kh_22MA)
+        Kh_22P__Passive_seeker_ = (1, WeaponsColdWarAssets.Kh_22P__Passive_seeker_)
+
+    class Pylon2:
+        FAB_3000_M54 = (2, WeaponsColdWarAssets.FAB_3000_M54)
+        FAB_9000_M54 = (2, WeaponsColdWarAssets.FAB_9000_M54)
+        _6_x_FAB_1500_M_54___1500kg_GP_Bombs_LD = (
+            2,
+            Weapons._6_x_FAB_1500_M_54___1500kg_GP_Bombs_LD,
+        )
+        MBD3_U2T_with_2_x_FAB_1500_M_54___1500kg_GP_Bombs_LD = (
+            2,
+            Weapons.MBD3_U2T_with_2_x_FAB_1500_M_54___1500kg_GP_Bombs_LD,
+        )
+        MBD3_U6_68_with_6_x_FAB_500_M_62___500kg_GP_Bombs_LD = (
+            2,
+            Weapons.MBD3_U6_68_with_6_x_FAB_500_M_62___500kg_GP_Bombs_LD,
+        )
+
+    # ERRR <CLEAN>
+
+    class Pylon3:
+        _33_x_FAB_250___250kg_GP_Bombs_LD = (
+            3,
+            Weapons._33_x_FAB_250___250kg_GP_Bombs_LD,
+        )
+
+    # ERRR <CLEAN>
+
+    pylons: Set[int] = {1, 2, 3}
+
+    tasks = [
+        task.Reconnaissance,
+        task.GroundAttack,
+        task.CAS,
+        task.RunwayAttack,
+        task.AntishipStrike,
+        task.PinpointStrike,
+        task.SEAD,
+    ]
+    task_default = task.GroundAttack
diff --git a/pydcs_extensions/f100/f100.py b/pydcs_extensions/f100/f100.py
index ec0b48d2..fb698aee 100644
--- a/pydcs_extensions/f100/f100.py
+++ b/pydcs_extensions/f100/f100.py
@@ -83,23 +83,23 @@ class VSN_F100(PlaneType):
         AGM_45A_Shrike_ARM = (3, Weapons.AGM_45A_Shrike_ARM)
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             3,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             3,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
         BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             3,
-            Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             3,
-            Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             3,
-            Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             3,
@@ -136,11 +136,11 @@ class VSN_F100(PlaneType):
         AGM_45A_Shrike_ARM = (4, Weapons.AGM_45A_Shrike_ARM)
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             4,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             4,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
         Fuel_tank_1000_Liter = (4, WeaponsF100.Fuel_tank_1000_Liter)
 
@@ -194,15 +194,15 @@ class VSN_F100(PlaneType):
         _3_Mk_83 = (5, Weapons._3_Mk_83)
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             5,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             5,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
         BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             5,
-            Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_7_with_AIM_9P_Sidewinder_IR_AAM = (
             5,
@@ -277,15 +277,15 @@ class VSN_F100(PlaneType):
         _3_Mk_83 = (7, Weapons._3_Mk_83)
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             7,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             7,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
         BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             7,
-            Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_7_with_AIM_9B_Sidewinder_IR_AAM = (
             7,
@@ -331,11 +331,11 @@ class VSN_F100(PlaneType):
         AGM_45A_Shrike_ARM = (8, Weapons.AGM_45A_Shrike_ARM)
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             8,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             8,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
         Fuel_tank_1000_Liter = (8, WeaponsF100.Fuel_tank_1000_Liter)
 
@@ -369,23 +369,23 @@ class VSN_F100(PlaneType):
         AGM_45A_Shrike_ARM = (9, Weapons.AGM_45A_Shrike_ARM)
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             9,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             9,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
         BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             9,
-            Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             9,
-            Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             9,
-            Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             9,
diff --git a/pydcs_extensions/f104/f104.py b/pydcs_extensions/f104/f104.py
index dbb472aa..c1879ec7 100644
--- a/pydcs_extensions/f104/f104.py
+++ b/pydcs_extensions/f104/f104.py
@@ -103,7 +103,7 @@ class VSN_F104C(PlaneType):
         )
         S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__ = (
             4,
-            Weapons.S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__,
+            Weapons.APU_68___S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_,
         )
         B_8M1___20_S_8OFP2 = (4, Weapons.B_8M1___20_S_8OFP2)
         B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = (
@@ -114,23 +114,23 @@ class VSN_F104C(PlaneType):
         Mk_83___1000lb_GP_Bomb_LD = (4, Weapons.Mk_83___1000lb_GP_Bomb_LD)
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             4,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             4,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             4,
-            Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             4,
-            Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             4,
-            Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         AIM_9L_Sidewinder_IR_AAM = (4, Weapons.AIM_9L_Sidewinder_IR_AAM)
         AIM_9B_Sidewinder_IR_AAM = (4, Weapons.AIM_9B_Sidewinder_IR_AAM)
@@ -142,7 +142,7 @@ class VSN_F104C(PlaneType):
         )
         BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             4,
-            Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             4,
@@ -158,7 +158,7 @@ class VSN_F104C(PlaneType):
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             4,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_42_with_3_x_Mk_81___250lb_GP_Bombs_LD = (
             4,
@@ -203,7 +203,7 @@ class VSN_F104C(PlaneType):
         )
         S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__ = (
             8,
-            Weapons.S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__,
+            Weapons.APU_68___S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_,
         )
         B_8M1___20_S_8OFP2 = (8, Weapons.B_8M1___20_S_8OFP2)
         B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = (
@@ -214,23 +214,23 @@ class VSN_F104C(PlaneType):
         Mk_83___1000lb_GP_Bomb_LD = (8, Weapons.Mk_83___1000lb_GP_Bomb_LD)
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             8,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             8,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             8,
-            Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             8,
-            Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             8,
-            Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         AIM_9L_Sidewinder_IR_AAM = (8, Weapons.AIM_9L_Sidewinder_IR_AAM)
         AIM_9B_Sidewinder_IR_AAM = (8, Weapons.AIM_9B_Sidewinder_IR_AAM)
@@ -242,7 +242,7 @@ class VSN_F104C(PlaneType):
         )
         BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             8,
-            Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             8,
@@ -258,7 +258,7 @@ class VSN_F104C(PlaneType):
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             8,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_42_with_3_x_Mk_81___250lb_GP_Bombs_LD = (
             8,
@@ -356,7 +356,7 @@ class VSN_F104G(PlaneType):
         )
         S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__ = (
             4,
-            Weapons.S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__,
+            Weapons.APU_68___S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_,
         )
         B_8M1___20_S_8OFP2 = (4, Weapons.B_8M1___20_S_8OFP2)
         B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = (
@@ -367,23 +367,23 @@ class VSN_F104G(PlaneType):
         Mk_83___1000lb_GP_Bomb_LD = (4, Weapons.Mk_83___1000lb_GP_Bomb_LD)
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             4,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             4,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             4,
-            Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             4,
-            Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             4,
-            Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         AIM_9L_Sidewinder_IR_AAM = (4, Weapons.AIM_9L_Sidewinder_IR_AAM)
         AIM_9B_Sidewinder_IR_AAM = (4, Weapons.AIM_9B_Sidewinder_IR_AAM)
@@ -395,7 +395,7 @@ class VSN_F104G(PlaneType):
         )
         BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             4,
-            Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             4,
@@ -411,7 +411,7 @@ class VSN_F104G(PlaneType):
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             4,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_42_with_3_x_Mk_81___250lb_GP_Bombs_LD = (
             4,
@@ -465,7 +465,7 @@ class VSN_F104G(PlaneType):
         )
         S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__ = (
             8,
-            Weapons.S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__,
+            Weapons.APU_68___S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_,
         )
         B_8M1___20_S_8OFP2 = (8, Weapons.B_8M1___20_S_8OFP2)
         B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = (
@@ -476,23 +476,23 @@ class VSN_F104G(PlaneType):
         Mk_83___1000lb_GP_Bomb_LD = (8, Weapons.Mk_83___1000lb_GP_Bomb_LD)
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             8,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             8,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             8,
-            Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             8,
-            Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             8,
-            Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         AIM_9L_Sidewinder_IR_AAM = (8, Weapons.AIM_9L_Sidewinder_IR_AAM)
         AIM_9B_Sidewinder_IR_AAM = (8, Weapons.AIM_9B_Sidewinder_IR_AAM)
@@ -504,7 +504,7 @@ class VSN_F104G(PlaneType):
         )
         BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             8,
-            Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             8,
@@ -520,7 +520,7 @@ class VSN_F104G(PlaneType):
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             8,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_42_with_3_x_Mk_81___250lb_GP_Bombs_LD = (
             8,
@@ -763,7 +763,7 @@ class VSN_F104S_AG(PlaneType):
         )
         S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__ = (
             3,
-            Weapons.S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__,
+            Weapons.APU_68___S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_,
         )
         B_8M1___20_S_8OFP2 = (3, Weapons.B_8M1___20_S_8OFP2)
         B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = (
@@ -808,7 +808,7 @@ class VSN_F104S_AG(PlaneType):
         )
         S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__ = (
             4,
-            Weapons.S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__,
+            Weapons.APU_68___S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_,
         )
         B_8M1___20_S_8OFP2 = (4, Weapons.B_8M1___20_S_8OFP2)
         B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = (
@@ -819,23 +819,23 @@ class VSN_F104S_AG(PlaneType):
         Mk_83___1000lb_GP_Bomb_LD = (4, Weapons.Mk_83___1000lb_GP_Bomb_LD)
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             4,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             4,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             4,
-            Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             4,
-            Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             4,
-            Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         AIM_9M_Sidewinder_IR_AAM = (4, Weapons.AIM_9M_Sidewinder_IR_AAM)
         AIM_9L_Sidewinder_IR_AAM = (4, Weapons.AIM_9L_Sidewinder_IR_AAM)
@@ -848,7 +848,7 @@ class VSN_F104S_AG(PlaneType):
         )
         BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             4,
-            Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             4,
@@ -864,7 +864,7 @@ class VSN_F104S_AG(PlaneType):
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             4,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_42_with_3_x_Mk_81___250lb_GP_Bombs_LD = (
             4,
@@ -929,7 +929,7 @@ class VSN_F104S_AG(PlaneType):
         )
         S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__ = (
             8,
-            Weapons.S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__,
+            Weapons.APU_68___S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_,
         )
         B_8M1___20_S_8OFP2 = (8, Weapons.B_8M1___20_S_8OFP2)
         B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = (
@@ -940,23 +940,23 @@ class VSN_F104S_AG(PlaneType):
         Mk_83___1000lb_GP_Bomb_LD = (8, Weapons.Mk_83___1000lb_GP_Bomb_LD)
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             8,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             8,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             8,
-            Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             8,
-            Weapons.BRU_33_with_2_x_LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.BRU_33_2_x_LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             8,
-            Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         AIM_9B_Sidewinder_IR_AAM = (8, Weapons.AIM_9B_Sidewinder_IR_AAM)
         AIM_9L_Sidewinder_IR_AAM = (8, Weapons.AIM_9L_Sidewinder_IR_AAM)
@@ -968,7 +968,7 @@ class VSN_F104S_AG(PlaneType):
         )
         BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             8,
-            Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             8,
@@ -984,7 +984,7 @@ class VSN_F104S_AG(PlaneType):
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             8,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_42_with_3_x_Mk_81___250lb_GP_Bombs_LD = (
             8,
@@ -1030,7 +1030,7 @@ class VSN_F104S_AG(PlaneType):
         )
         S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__ = (
             9,
-            Weapons.S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk__,
+            Weapons.APU_68___S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_,
         )
         B_8M1___20_S_8OFP2 = (9, Weapons.B_8M1___20_S_8OFP2)
         B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = (
diff --git a/pydcs_extensions/f105/f105.py b/pydcs_extensions/f105/f105.py
index 7f83bd89..1174a058 100644
--- a/pydcs_extensions/f105/f105.py
+++ b/pydcs_extensions/f105/f105.py
@@ -90,11 +90,11 @@ class VSN_F105G(PlaneType):
         AGM_45A_Shrike_ARM = (4, Weapons.AGM_45A_Shrike_ARM)
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             4,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             4,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
 
     # ERRR <CLEAN>
@@ -119,11 +119,11 @@ class VSN_F105G(PlaneType):
         _3_Mk_83 = (5, Weapons._3_Mk_83)
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             5,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             5,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
 
     # ERRR {BRU33_2*LAU61_M282}
@@ -164,11 +164,11 @@ class VSN_F105G(PlaneType):
         _3_Mk_83 = (7, Weapons._3_Mk_83)
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             7,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             7,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
 
     # ERRR {BRU33_2*LAU61_M282}
@@ -192,11 +192,11 @@ class VSN_F105G(PlaneType):
         AGM_45A_Shrike_ARM = (8, Weapons.AGM_45A_Shrike_ARM)
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             8,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             8,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
 
     # ERRR <CLEAN>
@@ -264,11 +264,11 @@ class VSN_F105D(PlaneType):
         AGM_45A_Shrike_ARM = (4, Weapons.AGM_45A_Shrike_ARM)
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             4,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             4,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
 
     # ERRR <CLEAN>
@@ -292,11 +292,11 @@ class VSN_F105D(PlaneType):
         _3_Mk_83 = (5, Weapons._3_Mk_83)
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             5,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             5,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
 
     # ERRR {BRU33_2*LAU61_M282}
@@ -336,11 +336,11 @@ class VSN_F105D(PlaneType):
         _3_Mk_83 = (7, Weapons._3_Mk_83)
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             7,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             7,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
 
     # ERRR {BRU33_2*LAU61_M282}
@@ -364,11 +364,11 @@ class VSN_F105D(PlaneType):
         AGM_45A_Shrike_ARM = (8, Weapons.AGM_45A_Shrike_ARM)
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             8,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             8,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
 
     # ERRR <CLEAN>
diff --git a/pydcs_extensions/f4/f4.py b/pydcs_extensions/f4/f4.py
index eee7e259..efae7cea 100644
--- a/pydcs_extensions/f4/f4.py
+++ b/pydcs_extensions/f4/f4.py
@@ -160,19 +160,19 @@ class VSN_F4B(PlaneType):
         Mk_84___2000lb_GP_Bomb_LD = (2, Weapons.Mk_84___2000lb_GP_Bomb_LD)
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             2,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             2,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         _3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             2,
-            Weapons._3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_42_3_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             2,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         Smokewinder___red = (2, Weapons.Smokewinder___red)
         Smokewinder___green = (2, Weapons.Smokewinder___green)
@@ -181,11 +181,11 @@ class VSN_F4B(PlaneType):
         Smokewinder___yellow = (2, Weapons.Smokewinder___yellow)
         BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             2,
-            Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             2,
-            Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_41A_with_6_x_Mk_82___500lb_GP_Bomb_LD = (
             2,
@@ -206,19 +206,19 @@ class VSN_F4B(PlaneType):
         Mk_84___2000lb_GP_Bomb_LD = (3, Weapons.Mk_84___2000lb_GP_Bomb_LD)
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             3,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         _3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             3,
-            Weapons._3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_42_3_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             3,
-            Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             3,
-            Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_105_2_AIM_9L = (3, Weapons.LAU_105_2_AIM_9L)
         LAU_105_with_2_x_AIM_9P_Sidewinder_IR_AAM = (
@@ -292,7 +292,7 @@ class VSN_F4B(PlaneType):
         )
         _3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             6,
-            Weapons._3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_42_3_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_42_with_3_x_Mk_82___500lb_GP_Bombs_LD = (
             6,
@@ -331,19 +331,19 @@ class VSN_F4B(PlaneType):
         Mk_84___2000lb_GP_Bomb_LD = (9, Weapons.Mk_84___2000lb_GP_Bomb_LD)
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             9,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         _3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             9,
-            Weapons._3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_42_3_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             9,
-            Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             9,
-            Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_105_2_AIM_9L = (9, Weapons.LAU_105_2_AIM_9L)
         LAU_105_with_2_x_AIM_9P_Sidewinder_IR_AAM = (
@@ -406,19 +406,19 @@ class VSN_F4B(PlaneType):
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             10,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             10,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         _3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             10,
-            Weapons._3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_42_3_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             10,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         Smokewinder___red = (10, Weapons.Smokewinder___red)
         Smokewinder___green = (10, Weapons.Smokewinder___green)
@@ -427,11 +427,11 @@ class VSN_F4B(PlaneType):
         Smokewinder___yellow = (10, Weapons.Smokewinder___yellow)
         BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             10,
-            Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             10,
-            Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_41A_with_6_x_Mk_82___500lb_GP_Bomb_LD = (
             10,
@@ -552,19 +552,19 @@ class VSN_F4C(PlaneType):
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             2,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             2,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         _3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             2,
-            Weapons._3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_42_3_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             2,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         Smokewinder___red = (2, Weapons.Smokewinder___red)
         Smokewinder___green = (2, Weapons.Smokewinder___green)
@@ -573,11 +573,11 @@ class VSN_F4C(PlaneType):
         Smokewinder___yellow = (2, Weapons.Smokewinder___yellow)
         BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             2,
-            Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             2,
-            Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_41A_with_6_x_Mk_82___500lb_GP_Bomb_LD = (
             2,
@@ -602,19 +602,19 @@ class VSN_F4C(PlaneType):
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             3,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         _3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             3,
-            Weapons._3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_42_3_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             3,
-            Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             3,
-            Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_105_2_AIM_9L = (3, Weapons.LAU_105_2_AIM_9L)
         LAU_105_with_2_x_AIM_9P_Sidewinder_IR_AAM = (
@@ -674,7 +674,7 @@ class VSN_F4C(PlaneType):
         )
         _3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             6,
-            Weapons._3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_42_3_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_42_with_3_x_Mk_82___500lb_GP_Bombs_LD = (
             6,
@@ -717,19 +717,19 @@ class VSN_F4C(PlaneType):
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             9,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         _3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             9,
-            Weapons._3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_42_3_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             9,
-            Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             9,
-            Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_105_2_AIM_9L = (9, Weapons.LAU_105_2_AIM_9L)
         LAU_105_with_2_x_AIM_9P_Sidewinder_IR_AAM = (
@@ -778,19 +778,19 @@ class VSN_F4C(PlaneType):
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             10,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             10,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         _3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             10,
-            Weapons._3_x_LAU_61_pods___57_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_42_3_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             10,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         Smokewinder___red = (10, Weapons.Smokewinder___red)
         Smokewinder___green = (10, Weapons.Smokewinder___green)
@@ -799,11 +799,11 @@ class VSN_F4C(PlaneType):
         Smokewinder___yellow = (10, Weapons.Smokewinder___yellow)
         BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             10,
-            Weapons.BRU_33_with_2_x_LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.BRU_33_2_x_LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             10,
-            Weapons.BRU_33_with_2_x_LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.BRU_33_2_x_LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         BRU_41A_with_6_x_Mk_82___500lb_GP_Bomb_LD = (
             10,
diff --git a/pydcs_extensions/f84g/f84g.py b/pydcs_extensions/f84g/f84g.py
index e4828ae4..2a4ef5eb 100644
--- a/pydcs_extensions/f84g/f84g.py
+++ b/pydcs_extensions/f84g/f84g.py
@@ -38,67 +38,67 @@ class VSN_F84G(PlaneType):
         Mk_83___1000lb_GP_Bomb_LD = (3, Weapons.Mk_83___1000lb_GP_Bomb_LD)
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             3,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             3,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             3,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             3,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             3,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             3,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             3,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             3,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         M117___750lb_GP_Bomb_LD = (3, Weapons.M117___750lb_GP_Bomb_LD)
         AN_M64___500lb_GP_Bomb_LD_ = (3, Weapons.AN_M64___500lb_GP_Bomb_LD_)
@@ -125,67 +125,67 @@ class VSN_F84G(PlaneType):
         Mk_83___1000lb_GP_Bomb_LD = (9, Weapons.Mk_83___1000lb_GP_Bomb_LD)
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             9,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             9,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             9,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             9,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             9,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             9,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             9,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             9,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             9,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             9,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             9,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             9,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             9,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             9,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             9,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             9,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         M117___750lb_GP_Bomb_LD = (9, Weapons.M117___750lb_GP_Bomb_LD)
         AN_M64___500lb_GP_Bomb_LD_ = (9, Weapons.AN_M64___500lb_GP_Bomb_LD_)
diff --git a/pydcs_extensions/f9f/f9f.py b/pydcs_extensions/f9f/f9f.py
index 61f30f9d..f37e7878 100644
--- a/pydcs_extensions/f9f/f9f.py
+++ b/pydcs_extensions/f9f/f9f.py
@@ -32,67 +32,67 @@ class VSN_F9F(PlaneType):
     class Pylon2:
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             2,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             2,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             2,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             2,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             2,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             2,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             2,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             2,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         AN_M64___500lb_GP_Bomb_LD_ = (2, Weapons.AN_M64___500lb_GP_Bomb_LD_)
         Mk_82___500lb_GP_Bomb_LD = (2, Weapons.Mk_82___500lb_GP_Bomb_LD)
@@ -100,11 +100,11 @@ class VSN_F9F(PlaneType):
         HVAR__UnGd_Rkt = (2, Weapons.HVAR__UnGd_Rkt)
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             2,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             2,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
 
     # ERRR <CLEAN>
@@ -112,67 +112,67 @@ class VSN_F9F(PlaneType):
     class Pylon3:
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             3,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             3,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             3,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             3,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             3,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             3,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             3,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             3,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         AN_M64___500lb_GP_Bomb_LD_ = (3, Weapons.AN_M64___500lb_GP_Bomb_LD_)
         Mk_82___500lb_GP_Bomb_LD = (3, Weapons.Mk_82___500lb_GP_Bomb_LD)
@@ -180,11 +180,11 @@ class VSN_F9F(PlaneType):
         HVAR__UnGd_Rkt = (3, Weapons.HVAR__UnGd_Rkt)
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             3,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             3,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
 
     # ERRR <CLEAN>
@@ -192,67 +192,67 @@ class VSN_F9F(PlaneType):
     class Pylon4:
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             4,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             4,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             4,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             4,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             4,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             4,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             4,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             4,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             4,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             4,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             4,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             4,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             4,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             4,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             4,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             4,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         AN_M64___500lb_GP_Bomb_LD_ = (4, Weapons.AN_M64___500lb_GP_Bomb_LD_)
         Mk_82___500lb_GP_Bomb_LD = (4, Weapons.Mk_82___500lb_GP_Bomb_LD)
@@ -260,11 +260,11 @@ class VSN_F9F(PlaneType):
         HVAR__UnGd_Rkt = (4, Weapons.HVAR__UnGd_Rkt)
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             4,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             4,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
 
     # ERRR <CLEAN>
@@ -274,67 +274,67 @@ class VSN_F9F(PlaneType):
         Mk_83___1000lb_GP_Bomb_LD = (5, Weapons.Mk_83___1000lb_GP_Bomb_LD)
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             5,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             5,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             5,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             5,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             5,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             5,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             5,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             5,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         M117___750lb_GP_Bomb_LD = (5, Weapons.M117___750lb_GP_Bomb_LD)
         AN_M64___500lb_GP_Bomb_LD_ = (5, Weapons.AN_M64___500lb_GP_Bomb_LD_)
@@ -362,67 +362,67 @@ class VSN_F9F(PlaneType):
         Mk_83___1000lb_GP_Bomb_LD = (7, Weapons.Mk_83___1000lb_GP_Bomb_LD)
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             7,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             7,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             7,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             7,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             7,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             7,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             7,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             7,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             7,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             7,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             7,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             7,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             7,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             7,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             7,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             7,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         M117___750lb_GP_Bomb_LD = (7, Weapons.M117___750lb_GP_Bomb_LD)
         AN_M64___500lb_GP_Bomb_LD_ = (7, Weapons.AN_M64___500lb_GP_Bomb_LD_)
@@ -440,67 +440,67 @@ class VSN_F9F(PlaneType):
     class Pylon8:
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             8,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             8,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             8,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             8,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             8,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             8,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             8,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             8,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             8,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             8,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             8,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             8,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             8,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             8,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             8,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             8,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         AN_M64___500lb_GP_Bomb_LD_ = (8, Weapons.AN_M64___500lb_GP_Bomb_LD_)
         Mk_82___500lb_GP_Bomb_LD = (8, Weapons.Mk_82___500lb_GP_Bomb_LD)
@@ -508,11 +508,11 @@ class VSN_F9F(PlaneType):
         HVAR__UnGd_Rkt = (8, Weapons.HVAR__UnGd_Rkt)
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             8,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             8,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
 
     # ERRR <CLEAN>
@@ -520,67 +520,67 @@ class VSN_F9F(PlaneType):
     class Pylon9:
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             9,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             9,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             9,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             9,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             9,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             9,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             9,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             9,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             9,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             9,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             9,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             9,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             9,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             9,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             9,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             9,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         AN_M64___500lb_GP_Bomb_LD_ = (9, Weapons.AN_M64___500lb_GP_Bomb_LD_)
         Mk_82___500lb_GP_Bomb_LD = (9, Weapons.Mk_82___500lb_GP_Bomb_LD)
@@ -588,11 +588,11 @@ class VSN_F9F(PlaneType):
         HVAR__UnGd_Rkt = (9, Weapons.HVAR__UnGd_Rkt)
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             9,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             9,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
 
     # ERRR <CLEAN>
@@ -600,67 +600,67 @@ class VSN_F9F(PlaneType):
     class Pylon10:
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             10,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             10,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             10,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             10,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             10,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             10,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             10,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             10,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             10,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             10,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             10,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             10,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             10,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             10,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             10,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             10,
-            Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_131___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         AN_M64___500lb_GP_Bomb_LD_ = (10, Weapons.AN_M64___500lb_GP_Bomb_LD_)
         Mk_82___500lb_GP_Bomb_LD = (10, Weapons.Mk_82___500lb_GP_Bomb_LD)
@@ -668,11 +668,11 @@ class VSN_F9F(PlaneType):
         HVAR__UnGd_Rkt = (10, Weapons.HVAR__UnGd_Rkt)
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             10,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             10,
-            Weapons.LAU_3_pod___19_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_3___19_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
 
     # ERRR <CLEAN>
diff --git a/pydcs_extensions/fa18efg/fa18efg.py b/pydcs_extensions/fa18efg/fa18efg.py
index d21fc616..781051db 100644
--- a/pydcs_extensions/fa18efg/fa18efg.py
+++ b/pydcs_extensions/fa18efg/fa18efg.py
@@ -4,6 +4,8 @@ from dcs import task
 from dcs.planes import PlaneType
 from dcs.unitpropertydescription import UnitPropertyDescription
 from dcs.weapons_data import Weapons
+from dcs.unitpropertydescription import UnitPropertyDescription
+
 
 from game.modsupport import planemod
 from pydcs_extensions.weapon_injector import inject_weapons
@@ -13,19 +15,543 @@ class WeaponsFA18EFG:
     AA42R_Buddy_Pod = {"clsid": "{AA42R}", "name": "AA42R Buddy Pod", "weight": 1520}
     ALQ_99Center = {"clsid": "{ALQ-99Center}", "name": "ALQ-99Center", "weight": 0}
     ALQ_99Wing = {"clsid": "{ALQ-99Wing}", "name": "ALQ-99Wing", "weight": 0}
+    ALQ_167 = {"clsid": "{ALQ-167}", "name": "ALQ-167", "weight": 50}
+    ALQ_249 = {"clsid": "{ALQ-249}", "name": "ALQ-249", "weight": 50}
     FLIR = {"clsid": "{FLIR}", "name": "FLIR", "weight": 0}
     FPU_12_Fuel_Tank_480_gallons = {
         "clsid": "{FPU_12_FUEL_TANK}",
         "name": "FPU-12 Fuel Tank 480 gallons",
         "weight": 1550,
     }
+    FPU_12_Fuel_Tank_480_gallons_ = {
+        "clsid": "{FPU_12_FUEL_TANK}",
+        "name": "FPU-12 Fuel Tank 480 gallons",
+        "weight": 1550,
+    }
     FPU_12_Fuel_Tank_480_gallons_High_Vis = {
         "clsid": "{FPU_12_FUEL_TANKHighVis}",
         "name": "FPU-12 Fuel Tank 480 gallons High Vis",
         "weight": 1550,
     }
+    FPU_12_Fuel_Tank_480_gallons_High_Vis_ = {
+        "clsid": "{FPU_12_FUEL_TANKHighVis}",
+        "name": "FPU-12 Fuel Tank 480 gallons High Vis",
+        "weight": 1550,
+    }
     TLAU_127 = {"clsid": "{TLAU_127}", "name": "TLAU_127", "weight": 0}
+    TLAU_127_ = {"clsid": "{TLAU_127}", "name": "TLAU_127", "weight": 0}
     USAFlag = {"clsid": "{USAFlag}", "name": "USAFlag", "weight": 0}
+    USAFlag_ = {"clsid": "{USAFlag}", "name": "USAFlag", "weight": 0}
+    Pylon_10_8___AIM_120C_AMRAAM___Active_Radar_AAM = {
+        "clsid": "{Right_Outboard_Inboard_2X_AIM-120C}",
+        "name": "Pylon 10 | 8 - AIM-120C AMRAAM - Active Radar AAM",
+        "weight": 322.96,
+    }
+    Pylon_10_8___AIM_120B_AMRAAM___Active_Radar_AAM = {
+        "clsid": "{Right_Outboard_Inboard_2X_AIM-120}",
+        "name": "Pylon 10 | 8 - AIM-120D AMRAAM - Active Radar AAM",
+        "weight": 324.8,
+    }
+    Pylon_10_8___BDU_33___25lb_Practice_Bomb_LD = {
+        "clsid": "{Right_Outboard_Inboard_2X_BDU-33}",
+        "name": "Pylon 10 | 8 - BDU-33 - 25lb Practice Bomb LD",
+        "weight": 22.6,
+    }
+    Pylon_10_8___BDU_45B___500lb_Practice_Bomb = {
+        "clsid": "{Right_Outboard_Inboard_2X_BDU-45B}",
+        "name": "Pylon 10 | 8 - BDU-45B - 500lb Practice Bomb",
+        "weight": 464,
+    }
+    Pylon_10_8___BDU_45___500lb_Practice_Bomb = {
+        "clsid": "{Right_Outboard_Inboard_2X_BDU-45}",
+        "name": "Pylon 10 | 8 - BDU-45 - 500lb Practice Bomb",
+        "weight": 464,
+    }
+    Pylon_10_8___BDU_50LGB___500lb_Laser_Guided_Inert_Practice_Bomb_LD = {
+        "clsid": "{Right_Outboard_Inboard_2X_BDU-50LGB}",
+        "name": "Pylon 10 | 8 - BDU-50LGB - 500lb Laser Guided Inert Practice Bomb LD",
+        "weight": 560,
+    }
+    Pylon_10_8___GBU_12___500lb_Laser_Guided_Bomb = {
+        "clsid": "{Right_Outboard_Inboard_2X_GBU-12}",
+        "name": "Pylon 10 | 8 - GBU-12 - 500lb Laser Guided Bomb",
+        "weight": 554,
+    }
+    Pylon_10_8___GBU_16___1000lb_Laser_Guided_Bomb = {
+        "clsid": "{Right_Outboard_Inboard_2X_GBU-16}",
+        "name": "Pylon 10 | 8 - GBU-16 - 1000lb Laser Guided Bomb",
+        "weight": 1026,
+    }
+    Pylon_10_8___GBU_38___JDAM__500lb_GPS_Guided_Bomb = {
+        "clsid": "{Right_Outboard_Inboard_2X_GBU-38}",
+        "name": "Pylon 10 | 8 - GBU-38 - JDAM, 500lb GPS Guided Bomb",
+        "weight": 482,
+    }
+    Pylon_10_8___Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = {
+        "clsid": "{Right_Outboard_Inboard_2X_ROCKEYE}",
+        "name": "Pylon 10 | 8 - Mk-20 Rockeye - 490lbs CBU, 247 x HEAT Bomblets",
+        "weight": 444,
+    }
+    Pylon_10_8___Mk_82Y___500lb_GP_Chute_Retarded_HD = {
+        "clsid": "{Right_Outboard_Inboard_2X_MK-82Y}",
+        "name": "Pylon 10 | 8 - Mk-82Y - 500lb GP Chute Retarded HD",
+        "weight": 464,
+    }
+    Pylon_10_8___Mk_82_Snakeye___500lb_GP_Bomb_HD = {
+        "clsid": "{Right_Outboard_Inboard_2X_MK-82_Snakeye}",
+        "name": "Pylon 10 | 8 - Mk-82 Snakeye - 500lb GP Bomb HD",
+        "weight": 499,
+    }
+    Pylon_10_8___Mk_82___500lb_GP_Bomb_LD = {
+        "clsid": "{Right_Outboard_Inboard_2X_MK-82}",
+        "name": "Pylon 10 | 8 - Mk-82 - 500lb GP Bomb LD",
+        "weight": 456,
+    }
+    Pylon_10_8___Mk_83___1000lb_GP_Bomb_LD = {
+        "clsid": "{Right_Outboard_Inboard_2X_MK-83}",
+        "name": "Pylon 10 | 8 - Mk-83 - 1000lb GP Bomb LD",
+        "weight": 908,
+    }
+    Pylon_2_4___AIM_120C_AMRAAM___Active_Radar_AAM = {
+        "clsid": "{Left_Outboard_Inboard_2X_AIM-120C}",
+        "name": "Pylon 2 | 4 - AIM-120C AMRAAM - Active Radar AAM",
+        "weight": 322.96,
+    }
+    Pylon_2_4___AIM_120B_AMRAAM___Active_Radar_AAM = {
+        "clsid": "{Left_Outboard_Inboard_2X_AIM-120}",
+        "name": "Pylon 2 | 4 - AIM-120D AMRAAM - Active Radar AAM",
+        "weight": 324.8,
+    }
+    Pylon_2_4___BDU_33___25lb_Practice_Bomb_LD = {
+        "clsid": "{Left_Outboard_Inboard_2X_BDU-33}",
+        "name": "Pylon 2 | 4 - BDU-33 - 25lb Practice Bomb LD",
+        "weight": 22.6,
+    }
+    Pylon_2_4___BDU_45B___500lb_Practice_Bomb = {
+        "clsid": "{Left_Outboard_Inboard_2X_BDU-45B}",
+        "name": "Pylon 2 | 4 - BDU-45B - 500lb Practice Bomb",
+        "weight": 464,
+    }
+    Pylon_2_4___BDU_45___500lb_Practice_Bomb = {
+        "clsid": "{Left_Outboard_Inboard_2X_BDU-45}",
+        "name": "Pylon 2 | 4 - BDU-45 - 500lb Practice Bomb",
+        "weight": 464,
+    }
+    Pylon_2_4___BDU_50LGB___500lb_Laser_Guided_Inert_Practice_Bomb_LD = {
+        "clsid": "{Left_Outboard_Inboard_2X_BDU-50LGB}",
+        "name": "Pylon 2 | 4 - BDU-50LGB - 500lb Laser Guided Inert Practice Bomb LD",
+        "weight": 560,
+    }
+    Pylon_2_4___GBU_12___500lb_Laser_Guided_Bomb = {
+        "clsid": "{Left_Outboard_Inboard_2X_GBU-12}",
+        "name": "Pylon 2 | 4 - GBU-12 - 500lb Laser Guided Bomb",
+        "weight": 554,
+    }
+    Pylon_2_4___GBU_16___1000lb_Laser_Guided_Bomb = {
+        "clsid": "{Left_Outboard_Inboard_2X_GBU-16}",
+        "name": "Pylon 2 | 4 - GBU-16 - 1000lb Laser Guided Bomb",
+        "weight": 1026,
+    }
+    Pylon_2_4___GBU_38___JDAM__500lb_GPS_Guided_Bomb = {
+        "clsid": "{Left_Outboard_Inboard_2X_GBU-38}",
+        "name": "Pylon 2 | 4 - GBU-38 - JDAM, 500lb GPS Guided Bomb",
+        "weight": 482,
+    }
+    Pylon_2_4___Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = {
+        "clsid": "{Left_Outboard_Inboard_2X_ROCKEYE}",
+        "name": "Pylon 2 | 4 - Mk-20 Rockeye - 490lbs CBU, 247 x HEAT Bomblets",
+        "weight": 444,
+    }
+    Pylon_2_4___Mk_82Y___500lb_GP_Chute_Retarded_HD = {
+        "clsid": "{Left_Outboard_Inboard_2X_MK-82Y}",
+        "name": "Pylon 2 | 4 - Mk-82Y - 500lb GP Chute Retarded HD",
+        "weight": 464,
+    }
+    Pylon_2_4___Mk_82_Snakeye___500lb_GP_Bomb_HD = {
+        "clsid": "{Left_Outboard_Inboard_2X_MK-82_Snakeye}",
+        "name": "Pylon 2 | 4 - Mk-82 Snakeye - 500lb GP Bomb HD",
+        "weight": 499,
+    }
+    Pylon_2_4___Mk_82___500lb_GP_Bomb_LD = {
+        "clsid": "{Left_Outboard_Inboard_2X_MK-82}",
+        "name": "Pylon 2 | 4 - Mk-82 - 500lb GP Bomb LD",
+        "weight": 456,
+    }
+    Pylon_2_4___Mk_83___1000lb_GP_Bomb_LD = {
+        "clsid": "{Left_Outboard_Inboard_2X_MK-83}",
+        "name": "Pylon 2 | 4 - Mk-83 - 1000lb GP Bomb LD",
+        "weight": 908,
+    }
+    Pylon_3_4___AGM_154A___JSOW_CEB__CBU_type_ = {
+        "clsid": "{Left_Midboard_Inboard_2X_AGM-154A}",
+        "name": "Pylon 3 | 4 - AGM-154A - JSOW CEB (CBU-type)",
+        "weight": 970,
+    }
+    Pylon_3_4___AGM_154C___JSOW_Unitary_BROACH = {
+        "clsid": "{Left_Midboard_Inboard_2X_AGM-154C}",
+        "name": "Pylon 3 | 4 - AGM-154C - JSOW Unitary BROACH",
+        "weight": 968,
+    }
+    Pylon_3_4___BDU_45B___500lb_Practice_Bomb = {
+        "clsid": "{Left_Midboard_Inboard_2X_BDU-45B}",
+        "name": "Pylon 3 | 4 - BDU-45B - 500lb Practice Bomb",
+        "weight": 464,
+    }
+    Pylon_3_4___BDU_45_LG___500lb_Practice_Laser_Guided_Bomb = {
+        "clsid": "{Left_Midboard_Inboard_2X_BDU-50LGB}",
+        "name": "Pylon 3 | 4 - BDU-45 LG - 500lb Practice Laser Guided Bomb",
+        "weight": 560,
+    }
+    Pylon_3_4___BDU_45___500lb_Practice_Bomb = {
+        "clsid": "{Left_Midboard_Inboard_2X_BDU-45}",
+        "name": "Pylon 3 | 4 - BDU-45 - 500lb Practice Bomb",
+        "weight": 464,
+    }
+    Pylon_3_4___GBU_12___500lb_Laser_Guided_Bomb = {
+        "clsid": "{Left_Midboard_Inboard_2X_GBU-12}",
+        "name": "Pylon 3 | 4 - GBU-12 - 500lb Laser Guided Bomb",
+        "weight": 554,
+    }
+    Pylon_3_4___GBU_16___1000lb_Laser_Guided_Bomb = {
+        "clsid": "{Left_Midboard_Inboard_2X_GBU-16}",
+        "name": "Pylon 3 | 4 - GBU-16 - 1000lb Laser Guided Bomb",
+        "weight": 1026,
+    }
+    Pylon_3_4___GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = {
+        "clsid": "{Left_Midboard_Inboard_2X_GBU-24}",
+        "name": "Pylon 3 | 4 - GBU-24A/B Paveway III - 2000lb Laser Guided Bomb",
+        "weight": 1868,
+    }
+    Pylon_3_4___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb = {
+        "clsid": "{Left_Midboard_Inboard_2X_GBU-31}",
+        "name": "Pylon 3 | 4 - GBU-31(V)2/B - JDAM, 2000lb GPS Guided Bomb",
+        "weight": 1868,
+    }
+    Pylon_3_4___GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb = {
+        "clsid": "{Left_Midboard_Inboard_2X_GBU-31V}",
+        "name": "Pylon 3 | 4 - GBU-31(V)4/B - JDAM, 2000lb GPS Guided Penetrator Bomb",
+        "weight": 1962,
+    }
+    Pylon_3_4___GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb = {
+        "clsid": "{Left_Midboard_Inboard_2X_GBU-38}",
+        "name": "Pylon 3 | 4 - GBU-38(V)1/B - JDAM, 500lb GPS Guided Bomb",
+        "weight": 482,
+    }
+    Pylon_3_4___Mk_20_Rockeye___490lb_CBU__247_x_HEAT_Bomblets = {
+        "clsid": "{Left_Midboard_Inboard_2X_ROCKEYE}",
+        "name": "Pylon 3 | 4 - Mk-20 Rockeye - 490lb CBU, 247 x HEAT Bomblets",
+        "weight": 444,
+    }
+    Pylon_3_4___Mk_82Y___500lb_GP_Bomb_Chute_Retarded_HD = {
+        "clsid": "{Left_Midboard_Inboard_2X_MK-82Y}",
+        "name": "Pylon 3 | 4 - Mk-82Y - 500lb GP Bomb Chute Retarded HD",
+        "weight": 464,
+    }
+    Pylon_3_4___Mk_82_Snakeye___500lb_GP_Bomb_HD = {
+        "clsid": "{Left_Midboard_Inboard_2X_MK-82_Snakeye}",
+        "name": "Pylon 3 | 4 - Mk-82 Snakeye - 500lb GP Bomb HD",
+        "weight": 499,
+    }
+    Pylon_3_4___Mk_82___500lb_GP_Bomb_LD = {
+        "clsid": "{Left_Midboard_Inboard_2X_MK-82}",
+        "name": "Pylon 3 | 4 - Mk-82 - 500lb GP Bomb LD",
+        "weight": 456,
+    }
+    Pylon_3_4___Mk_83___1000lb_GP_Bomb_LD = {
+        "clsid": "{Left_Midboard_Inboard_2X_MK-83}",
+        "name": "Pylon 3 | 4 - Mk-83 - 1000lb GP Bomb LD",
+        "weight": 908,
+    }
+    Pylon_3_4___Mk_84___2000lb_GP_Bomb_LD = {
+        "clsid": "{Left_Midboard_Inboard_2X_MK-84}",
+        "name": "Pylon 3 | 4 - Mk-84 - 2000lb GP Bomb LD",
+        "weight": 1824,
+    }
+    Pylon_4___AGM_154A___JSOW_CEB__CBU_type_ = {
+        "clsid": "{Left_Midboard_Inboard_1X_AGM-154A}",
+        "name": "Pylon 4 - AGM-154A - JSOW CEB (CBU-type)",
+        "weight": 485,
+    }
+    Pylon_4___AGM_154C___JSOW_Unitary_BROACH = {
+        "clsid": "{Left_Midboard_Inboard_1X_AGM-154C}",
+        "name": "Pylon 4 - AGM-154C - JSOW Unitary BROACH",
+        "weight": 484,
+    }
+    Pylon_4___AGM_84A_Harpoon_AShM = {
+        "clsid": "{Left_Inboard_1X_AGM-84A}",
+        "name": "Pylon 4 - AGM-84A Harpoon AShM",
+        "weight": 540,
+    }
+    Pylon_4___AGM_84D_Harpoon_AShM = {
+        "clsid": "{Left_Inboard_1X_AGM-84D}",
+        "name": "Pylon 4 - AGM-84D Harpoon AShM",
+        "weight": 540,
+    }
+    Pylon_4___AGM_84E_Harpoon_SLAM = {
+        "clsid": "{Left_Inboard_1X_AGM-84E}",
+        "name": "Pylon 4 - AGM-84E Harpoon/SLAM",
+        "weight": 628,
+    }
+    Pylon_4___BDU_45B___500lb_Practice_Bomb = {
+        "clsid": "{Left_Midboard_Inboard_1X_BDU-45B}",
+        "name": "Pylon 4 - BDU-45B - 500lb Practice Bomb",
+        "weight": 232,
+    }
+    Pylon_4___BDU_45_LG___500lb_Practice_Laser_Guided_Bomb = {
+        "clsid": "{Left_Midboard_Inboard_1X_BDU-50LGB}",
+        "name": "Pylon 4 - BDU-45 LG - 500lb Practice Laser Guided Bomb",
+        "weight": 280,
+    }
+    Pylon_4___BDU_45___500lb_Practice_Bomb = {
+        "clsid": "{Left_Midboard_Inboard_1X_BDU-45}",
+        "name": "Pylon 4 - BDU-45 - 500lb Practice Bomb",
+        "weight": 232,
+    }
+    Pylon_4___GBU_12___500lb_Laser_Guided_Bomb = {
+        "clsid": "{Left_Midboard_Inboard_1X_GBU-12}",
+        "name": "Pylon 4 - GBU-12 - 500lb Laser Guided Bomb",
+        "weight": 277,
+    }
+    Pylon_4___GBU_16___1000lb_Laser_Guided_Bomb = {
+        "clsid": "{Left_Midboard_Inboard_1X_GBU-16}",
+        "name": "Pylon 4 - GBU-16 - 1000lb Laser Guided Bomb",
+        "weight": 513,
+    }
+    Pylon_4___GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = {
+        "clsid": "{Left_Midboard_Inboard_1X_GBU-24}",
+        "name": "Pylon 4 - GBU-24A/B Paveway III - 2000lb Laser Guided Bomb",
+        "weight": 934,
+    }
+    Pylon_4___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb = {
+        "clsid": "{Left_Midboard_Inboard_1X_GBU-31}",
+        "name": "Pylon 4 - GBU-31(V)2/B - JDAM, 2000lb GPS Guided Bomb",
+        "weight": 934,
+    }
+    Pylon_4___GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb = {
+        "clsid": "{Left_Midboard_Inboard_1X_GBU-31V}",
+        "name": "Pylon 4 - GBU-31(V)4/B - JDAM, 2000lb GPS Guided Penetrator Bomb",
+        "weight": 981,
+    }
+    Pylon_4___GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb = {
+        "clsid": "{Left_Midboard_Inboard_1X_GBU-38}",
+        "name": "Pylon 4 - GBU-38(V)1/B - JDAM, 500lb GPS Guided Bomb",
+        "weight": 241,
+    }
+    Pylon_4___Mk_20_Rockeye___490lb_CBU__247_x_HEAT_Bomblets = {
+        "clsid": "{Left_Midboard_Inboard_1X_ROCKEYE}",
+        "name": "Pylon 4 - Mk-20 Rockeye - 490lb CBU, 247 x HEAT Bomblets",
+        "weight": 222,
+    }
+    Pylon_4___Mk_82Y___500lb_GP_Bomb_Chute_Retarded_HD = {
+        "clsid": "{Left_Midboard_Inboard_1X_MK-82Y}",
+        "name": "Pylon 4 - Mk-82Y - 500lb GP Bomb Chute Retarded HD",
+        "weight": 232,
+    }
+    Pylon_4___Mk_82_Snakeye___500lb_GP_Bomb_HD = {
+        "clsid": "{Left_Midboard_Inboard_1X_MK-82_Snakeye}",
+        "name": "Pylon 4 - Mk-82 Snakeye - 500lb GP Bomb HD",
+        "weight": 249.5,
+    }
+    Pylon_4___Mk_82___500lb_GP_Bomb_LD = {
+        "clsid": "{Left_Midboard_Inboard_1X_MK-82}",
+        "name": "Pylon 4 - Mk-82 - 500lb GP Bomb LD",
+        "weight": 228,
+    }
+    Pylon_4___Mk_83___1000lb_GP_Bomb_LD = {
+        "clsid": "{Left_Midboard_Inboard_1X_MK-83}",
+        "name": "Pylon 4 - Mk-83 - 1000lb GP Bomb LD",
+        "weight": 454,
+    }
+    Pylon_4___Mk_84___2000lb_GP_Bomb_LD = {
+        "clsid": "{Left_Midboard_Inboard_1X_MK-84}",
+        "name": "Pylon 4 - Mk-84 - 2000lb GP Bomb LD",
+        "weight": 912,
+    }
+    Pylon_8___AGM_154A___JSOW_CEB__CBU_type_ = {
+        "clsid": "{Right_Midboard_Inboard_1X_AGM-154A}",
+        "name": "Pylon 8 - AGM-154A - JSOW CEB (CBU-type)",
+        "weight": 485,
+    }
+    Pylon_8___AGM_154C___JSOW_Unitary_BROACH = {
+        "clsid": "{Right_Midboard_Inboard_1X_AGM-154C}",
+        "name": "Pylon 8 - AGM-154C - JSOW Unitary BROACH",
+        "weight": 484,
+    }
+    Pylon_8___AGM_84A_Harpoon_AShM = {
+        "clsid": "{Right_Inboard_1X_AGM-84A}",
+        "name": "Pylon 8 - AGM-84A Harpoon AShM",
+        "weight": 540,
+    }
+    Pylon_8___AGM_84D_Harpoon_AShM = {
+        "clsid": "{Right_Inboard_1X_AGM-84D}",
+        "name": "Pylon 8 - AGM-84D Harpoon AShM",
+        "weight": 540,
+    }
+    Pylon_8___AGM_84E_Harpoon_SLAM = {
+        "clsid": "{Right_Inboard_1X_AGM-84E}",
+        "name": "Pylon 8 - AGM-84E Harpoon/SLAM",
+        "weight": 628,
+    }
+    Pylon_8___BDU_45B___500lb_Practice_Bomb = {
+        "clsid": "{Right_Midboard_Inboard_1X_BDU-45B}",
+        "name": "Pylon 8 - BDU-45B - 500lb Practice Bomb",
+        "weight": 232,
+    }
+    Pylon_8___BDU_45_LG___500lb_Practice_Laser_Guided_Bomb = {
+        "clsid": "{Right_Midboard_Inboard_1X_BDU-50LGB}",
+        "name": "Pylon 8 - BDU-45 LG - 500lb Practice Laser Guided Bomb",
+        "weight": 280,
+    }
+    Pylon_8___BDU_45___500lb_Practice_Bomb = {
+        "clsid": "{Right_Midboard_Inboard_1X_BDU-45}",
+        "name": "Pylon 8 - BDU-45 - 500lb Practice Bomb",
+        "weight": 232,
+    }
+    Pylon_8___GBU_12___500lb_Laser_Guided_Bomb = {
+        "clsid": "{Right_Midboard_Inboard_1X_GBU-12}",
+        "name": "Pylon 8 - GBU-12 - 500lb Laser Guided Bomb",
+        "weight": 277,
+    }
+    Pylon_8___GBU_16___1000lb_Laser_Guided_Bomb = {
+        "clsid": "{Right_Midboard_Inboard_1X_GBU-16}",
+        "name": "Pylon 8 - GBU-16 - 1000lb Laser Guided Bomb",
+        "weight": 513,
+    }
+    Pylon_8___GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = {
+        "clsid": "{Right_Midboard_Inboard_1X_GBU-24}",
+        "name": "Pylon 8 - GBU-24A/B Paveway III - 2000lb Laser Guided Bomb",
+        "weight": 934,
+    }
+    Pylon_8___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb = {
+        "clsid": "{Right_Midboard_Inboard_1X_GBU-31}",
+        "name": "Pylon 8 - GBU-31(V)2/B - JDAM, 2000lb GPS Guided Bomb",
+        "weight": 934,
+    }
+    Pylon_8___GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb = {
+        "clsid": "{Right_Midboard_Inboard_1X_GBU-31V}",
+        "name": "Pylon 8 - GBU-31(V)4/B - JDAM, 2000lb GPS Guided Penetrator Bomb",
+        "weight": 981,
+    }
+    Pylon_8___GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb = {
+        "clsid": "{Right_Midboard_Inboard_1X_GBU-38}",
+        "name": "Pylon 8 - GBU-38(V)1/B - JDAM, 500lb GPS Guided Bomb",
+        "weight": 241,
+    }
+    Pylon_8___Mk_20_Rockeye___490lb_CBU__247_x_HEAT_Bomblets = {
+        "clsid": "{Right_Midboard_Inboard_1X_ROCKEYE}",
+        "name": "Pylon 8 - Mk-20 Rockeye - 490lb CBU, 247 x HEAT Bomblets",
+        "weight": 222,
+    }
+    Pylon_8___Mk_82Y___500lb_GP_Bomb_Chute_Retarded_HD = {
+        "clsid": "{Right_Midboard_Inboard_1X_MK-82Y}",
+        "name": "Pylon 8 - Mk-82Y - 500lb GP Bomb Chute Retarded HD",
+        "weight": 232,
+    }
+    Pylon_8___Mk_82_Snakeye___500lb_GP_Bomb_HD = {
+        "clsid": "{Right_Midboard_Inboard_1X_MK-82_Snakeye}",
+        "name": "Pylon 8 - Mk-82 Snakeye - 500lb GP Bomb HD",
+        "weight": 249.5,
+    }
+    Pylon_8___Mk_82___500lb_GP_Bomb_LD = {
+        "clsid": "{Right_Midboard_Inboard_1X_MK-82}",
+        "name": "Pylon 8 - Mk-82 - 500lb GP Bomb LD",
+        "weight": 228,
+    }
+    Pylon_8___Mk_83___1000lb_GP_Bomb_LD = {
+        "clsid": "{Right_Midboard_Inboard_1X_MK-83}",
+        "name": "Pylon 8 - Mk-83 - 1000lb GP Bomb LD",
+        "weight": 454,
+    }
+    Pylon_8___Mk_84___2000lb_GP_Bomb_LD = {
+        "clsid": "{Right_Midboard_Inboard_1X_MK-84}",
+        "name": "Pylon 8 - Mk-84 - 2000lb GP Bomb LD",
+        "weight": 912,
+    }
+    Pylon_9_8___AGM_154A___JSOW_CEB__CBU_type_ = {
+        "clsid": "{Right_Midboard_Inboard_2X_AGM-154A}",
+        "name": "Pylon 9 | 8 - AGM-154A - JSOW CEB (CBU-type)",
+        "weight": 970,
+    }
+    Pylon_9_8___AGM_154C___JSOW_Unitary_BROACH = {
+        "clsid": "{Right_Midboard_Inboard_2X_AGM-154C}",
+        "name": "Pylon 9 | 8 - AGM-154C - JSOW Unitary BROACH",
+        "weight": 968,
+    }
+    Pylon_9_8___BDU_45B___500lb_Practice_Bomb = {
+        "clsid": "{Right_Midboard_Inboard_2X_BDU-45B}",
+        "name": "Pylon 9 | 8 - BDU-45B - 500lb Practice Bomb",
+        "weight": 464,
+    }
+    Pylon_9_8___BDU_45_LG___500lb_Practice_Laser_Guided_Bomb = {
+        "clsid": "{Right_Midboard_Inboard_2X_BDU-50LGB}",
+        "name": "Pylon 9 | 8 - BDU-45 LG - 500lb Practice Laser Guided Bomb",
+        "weight": 560,
+    }
+    Pylon_9_8___BDU_45___500lb_Practice_Bomb = {
+        "clsid": "{Right_Midboard_Inboard_2X_BDU-45}",
+        "name": "Pylon 9 | 8 - BDU-45 - 500lb Practice Bomb",
+        "weight": 464,
+    }
+    Pylon_9_8___GBU_12___500lb_Laser_Guided_Bomb = {
+        "clsid": "{Right_Midboard_Inboard_2X_GBU-12}",
+        "name": "Pylon 9 | 8 - GBU-12 - 500lb Laser Guided Bomb",
+        "weight": 554,
+    }
+    Pylon_9_8___GBU_16___1000lb_Laser_Guided_Bomb = {
+        "clsid": "{Right_Midboard_Inboard_2X_GBU-16}",
+        "name": "Pylon 9 | 8 - GBU-16 - 1000lb Laser Guided Bomb",
+        "weight": 1026,
+    }
+    Pylon_9_8___GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = {
+        "clsid": "{Right_Midboard_Inboard_2X_GBU-24}",
+        "name": "Pylon 9 | 8 - GBU-24A/B Paveway III - 2000lb Laser Guided Bomb",
+        "weight": 1868,
+    }
+    Pylon_9_8___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb = {
+        "clsid": "{Right_Midboard_Inboard_2X_GBU-31}",
+        "name": "Pylon 9 | 8 - GBU-31(V)2/B - JDAM, 2000lb GPS Guided Bomb",
+        "weight": 1868,
+    }
+    Pylon_9_8___GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb = {
+        "clsid": "{Right_Midboard_Inboard_2X_GBU-31V}",
+        "name": "Pylon 9 | 8 - GBU-31(V)4/B - JDAM, 2000lb GPS Guided Penetrator Bomb",
+        "weight": 1962,
+    }
+    Pylon_9_8___GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb = {
+        "clsid": "{Right_Midboard_Inboard_2X_GBU-38}",
+        "name": "Pylon 9 | 8 - GBU-38(V)1/B - JDAM, 500lb GPS Guided Bomb",
+        "weight": 482,
+    }
+    Pylon_9_8___Mk_20_Rockeye___490lb_CBU__247_x_HEAT_Bomblets = {
+        "clsid": "{Right_Midboard_Inboard_2X_ROCKEYE}",
+        "name": "Pylon 9 | 8 - Mk-20 Rockeye - 490lb CBU, 247 x HEAT Bomblets",
+        "weight": 444,
+    }
+    Pylon_9_8___Mk_82Y___500lb_GP_Bomb_Chute_Retarded_HD = {
+        "clsid": "{Right_Midboard_Inboard_2X_MK-82Y}",
+        "name": "Pylon 9 | 8 - Mk-82Y - 500lb GP Bomb Chute Retarded HD",
+        "weight": 464,
+    }
+    Pylon_9_8___Mk_82_Snakeye___500lb_GP_Bomb_HD = {
+        "clsid": "{Right_Midboard_Inboard_2X_MK-82_Snakeye}",
+        "name": "Pylon 9 | 8 - Mk-82 Snakeye - 500lb GP Bomb HD",
+        "weight": 499,
+    }
+    Pylon_9_8___Mk_82___500lb_GP_Bomb_LD = {
+        "clsid": "{Right_Midboard_Inboard_2X_MK-82}",
+        "name": "Pylon 9 | 8 - Mk-82 - 500lb GP Bomb LD",
+        "weight": 456,
+    }
+    Pylon_9_8___Mk_83___1000lb_GP_Bomb_LD = {
+        "clsid": "{Right_Midboard_Inboard_2X_MK-83}",
+        "name": "Pylon 9 | 8 - Mk-83 - 1000lb GP Bomb LD",
+        "weight": 908,
+    }
+    Pylon_9_8___Mk_84___2000lb_GP_Bomb_LD = {
+        "clsid": "{Right_Midboard_Inboard_2X_MK-84}",
+        "name": "Pylon 9 | 8 - Mk-84 - 2000lb GP Bomb LD",
+        "weight": 1824,
+    }
 
 
 inject_weapons(WeaponsFA18EFG)
@@ -238,31 +764,6 @@ class FA_18E(PlaneType):
 
     class Pylon2:
         TLAU_127 = (2, WeaponsFA18EFG.TLAU_127)
-        AIM_120B_AMRAAM___Active_Radar_AAM = (
-            2,
-            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
-        )
-        AIM_120C_AMRAAM___Active_Radar_AAM = (
-            2,
-            Weapons.AIM_120C_AMRAAM___Active_Radar_AAM,
-        )
-        # ERRR {CATM-120C}
-        LAU_115C_with_AIM_7M_Sparrow_Semi_Active_Radar = (
-            2,
-            Weapons.LAU_115C_with_AIM_7M_Sparrow_Semi_Active_Radar,
-        )
-        LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar = (
-            2,
-            Weapons.LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar,
-        )
-        LAU_115C_with_AIM_7MH_Sparrow_Semi_Active_Radar = (
-            2,
-            Weapons.LAU_115C_with_AIM_7MH_Sparrow_Semi_Active_Radar,
-        )
-        LAU_115C_with_AIM_7P_Sparrow_Semi_Active_Radar = (
-            2,
-            Weapons.LAU_115C_with_AIM_7P_Sparrow_Semi_Active_Radar,
-        )
         # ERRR LAU_117_TGM_65E
         # ERRR LAU_117_TGM_65F
         LAU_117_with_AGM_65E___Maverick_E__Laser_ASM___Lg_Whd_ = (
@@ -318,21 +819,59 @@ class FA_18E(PlaneType):
             2,
             Weapons.GBU_54_V_1_B___LJDAM__500lb_Laser__GPS_Guided_Bomb_LD,
         )
-        BRU_42_with_2_x_ADM_141A_TALD = (
-            2,
-            Weapons.BRU_42_with_2_x_ADM_141A_TALD,
-        )
+        AGM_154A___JSOW_CEB__CBU_type_ = (2, Weapons.AGM_154A___JSOW_CEB__CBU_type_)
+        AGM_154C___JSOW_Unitary_BROACH = (2, Weapons.AGM_154C___JSOW_Unitary_BROACH)
+        BRU_42_with_2_x_ADM_141A_TALD = (2, Weapons.BRU_42_with_2_x_ADM_141A_TALD)
         BRU_42_with_ADM_141A_TALD = (2, Weapons.BRU_42_with_ADM_141A_TALD)
+        AN_ASQ_T50_TCTS_Pod___ACMI_Pod = (2, Weapons.AN_ASQ_T50_TCTS_Pod___ACMI_Pod)
+        AIM_120B_AMRAAM___Active_Radar_AAM = (
+            2,
+            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
+        )
+        AIM_120C_AMRAAM___Active_Radar_AAM = (
+            2,
+            Weapons.AIM_120C_AMRAAM___Active_Radar_AAM,
+        )
+        AIM_9X_Sidewinder_IR_AAM = (2, Weapons.AIM_9X_Sidewinder_IR_AAM)
+        # ERRR {CATM-120C}
+        Pylon_2_4___GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
+            2,
+            WeaponsFA18EFG.Pylon_2_4___GBU_38___JDAM__500lb_GPS_Guided_Bomb,
+        )
+        Pylon_2_4___Mk_82___500lb_GP_Bomb_LD = (
+            2,
+            WeaponsFA18EFG.Pylon_2_4___Mk_82___500lb_GP_Bomb_LD,
+        )
+        Pylon_2_4___Mk_82Y___500lb_GP_Chute_Retarded_HD = (
+            2,
+            WeaponsFA18EFG.Pylon_2_4___Mk_82Y___500lb_GP_Chute_Retarded_HD,
+        )
+        Pylon_2_4___Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+            2,
+            WeaponsFA18EFG.Pylon_2_4___Mk_82_Snakeye___500lb_GP_Bomb_HD,
+        )
+        Pylon_2_4___Mk_83___1000lb_GP_Bomb_LD = (
+            2,
+            WeaponsFA18EFG.Pylon_2_4___Mk_83___1000lb_GP_Bomb_LD,
+        )
+        Pylon_2_4___GBU_12___500lb_Laser_Guided_Bomb = (
+            2,
+            WeaponsFA18EFG.Pylon_2_4___GBU_12___500lb_Laser_Guided_Bomb,
+        )
+        Pylon_2_4___GBU_16___1000lb_Laser_Guided_Bomb = (
+            2,
+            WeaponsFA18EFG.Pylon_2_4___GBU_16___1000lb_Laser_Guided_Bomb,
+        )
+        Pylon_2_4___Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
+            2,
+            WeaponsFA18EFG.Pylon_2_4___Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
+        )
 
     class Pylon3:
-        LAU_115_2_LAU_127_AIM_9M = (3, Weapons.LAU_115_2_LAU_127_AIM_9M)
-        LAU_115_2_LAU_127_CATM_9M = (3, Weapons.LAU_115_2_LAU_127_CATM_9M)
-        LAU_115_2_LAU_127_AIM_9L = (3, Weapons.LAU_115_2_LAU_127_AIM_9L)
-        LAU_115_2_LAU_127_AIM_9X = (3, Weapons.LAU_115_2_LAU_127_AIM_9X)
-        LAU_115_LAU_127_AIM_9X = (3, Weapons.LAU_115_LAU_127_AIM_9X)
-        LAU_115_LAU_127_CATM_9M = (3, Weapons.LAU_115_LAU_127_CATM_9M)
-        LAU_115_LAU_127_AIM_9L = (3, Weapons.LAU_115_LAU_127_AIM_9L)
-        LAU_115_LAU_127_AIM_9M = (3, Weapons.LAU_115_LAU_127_AIM_9M)
+        ALQ_167 = (3, WeaponsFA18EFG.ALQ_167)
+        LAU_115_2_LAU_127_AIM_120B = (3, Weapons.LAU_115_2_LAU_127_AIM_120B)
+        LAU_115_2_LAU_127_AIM_120C = (3, Weapons.LAU_115_2_LAU_127_AIM_120C)
+        # ERRR LAU-115_2*LAU-127_CATM-120C
         LAU_115C_with_AIM_7M_Sparrow_Semi_Active_Radar = (
             3,
             Weapons.LAU_115C_with_AIM_7M_Sparrow_Semi_Active_Radar,
@@ -354,17 +893,6 @@ class FA_18E(PlaneType):
             3,
             WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_High_Vis,
         )
-        AIM_120B_AMRAAM___Active_Radar_AAM = (
-            3,
-            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
-        )
-        AIM_120C_AMRAAM___Active_Radar_AAM = (
-            3,
-            Weapons.AIM_120C_AMRAAM___Active_Radar_AAM,
-        )
-        LAU_115_2_LAU_127_AIM_120B = (3, Weapons.LAU_115_2_LAU_127_AIM_120B)
-        LAU_115_2_LAU_127_AIM_120C = (3, Weapons.LAU_115_2_LAU_127_AIM_120C)
-        # ERRR LAU-115_2*LAU-127_CATM-120C
         # ERRR LAU_117_TGM_65E
         # ERRR LAU_117_TGM_65F
         LAU_117_with_AGM_65E___Maverick_E__Laser_ASM___Lg_Whd_ = (
@@ -401,34 +929,6 @@ class FA_18E(PlaneType):
             3,
             Weapons.AGM_84H_SLAM_ER__Expanded_Response_,
         )
-        BRU_33_with_2_x_Mk_82___500lb_GP_Bomb_LD = (
-            3,
-            Weapons.BRU_33_with_2_x_Mk_82___500lb_GP_Bomb_LD,
-        )
-        BRU_33_with_2_x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
-            3,
-            Weapons.BRU_33_with_2_x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
-        )
-        BRU_33_with_2_x_Mk_82Y___500lb_GP_Chute_Retarded_HD = (
-            3,
-            Weapons.BRU_33_with_2_x_Mk_82Y___500lb_GP_Chute_Retarded_HD,
-        )
-        BRU_33_with_2_x_BDU_45___500lb_Practice_Bomb = (
-            3,
-            Weapons.BRU_33_with_2_x_BDU_45___500lb_Practice_Bomb,
-        )
-        BRU_33_with_2_x_BDU_45B___500lb_Practice_Bomb = (
-            3,
-            Weapons.BRU_33_with_2_x_BDU_45B___500lb_Practice_Bomb,
-        )
-        BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
-            3,
-            Weapons.BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
-        )
-        BRU_33_with_2_x_Mk_83___1000lb_GP_Bomb_LD = (
-            3,
-            Weapons.BRU_33_with_2_x_Mk_83___1000lb_GP_Bomb_LD,
-        )
         BRU_41A_with_6_x_BDU_33___25lb_Practice_Bomb_LD = (
             3,
             Weapons.BRU_41A_with_6_x_BDU_33___25lb_Practice_Bomb_LD,
@@ -437,10 +937,11 @@ class FA_18E(PlaneType):
             3,
             Weapons.GBU_10___2000lb_Laser_Guided_Bomb,
         )
-        GBU_12___500lb_Laser_Guided_Bomb = (
+        BRU_41A_with_6_x_BDU_33___25lb_Practice_Bomb_LD = (
             3,
-            Weapons.GBU_12___500lb_Laser_Guided_Bomb,
+            Weapons.BRU_41A_with_6_x_BDU_33___25lb_Practice_Bomb_LD,
         )
+        GBU_12___500lb_Laser_Guided_Bomb = (3, Weapons.GBU_12___500lb_Laser_Guided_Bomb)
         GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = (
             3,
             Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb,
@@ -449,18 +950,10 @@ class FA_18E(PlaneType):
             3,
             Weapons.GBU_16___1000lb_Laser_Guided_Bomb,
         )
-        CBU_99___490lbs__247_x_HEAT_Bomblets = (
-            3,
-            Weapons.CBU_99___490lbs__247_x_HEAT_Bomblets,
-        )
         Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             3,
             Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
-        BRU_33_with_2_x_CBU_99___490lbs__247_x_HEAT_Bomblets = (
-            3,
-            Weapons.BRU_33_with_2_x_CBU_99___490lbs__247_x_HEAT_Bomblets,
-        )
         BRU_33_with_2_x_GBU_12___500lb_Laser_Guided_Bomb = (
             3,
             Weapons.BRU_33_with_2_x_GBU_12___500lb_Laser_Guided_Bomb,
@@ -517,6 +1010,134 @@ class FA_18E(PlaneType):
             Weapons.BRU_42_with_2_x_ADM_141A_TALD,
         )
         BRU_42_with_ADM_141A_TALD = (3, Weapons.BRU_42_with_ADM_141A_TALD)
+        Pylon_3_4___Mk_82___500lb_GP_Bomb_LD = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___Mk_82___500lb_GP_Bomb_LD,
+        )
+        Pylon_3_4___Mk_82Y___500lb_GP_Bomb_Chute_Retarded_HD = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___Mk_82Y___500lb_GP_Bomb_Chute_Retarded_HD,
+        )
+        Pylon_3_4___Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___Mk_82_Snakeye___500lb_GP_Bomb_HD,
+        )
+        Pylon_3_4___Mk_83___1000lb_GP_Bomb_LD = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___Mk_83___1000lb_GP_Bomb_LD,
+        )
+        Pylon_3_4___Mk_84___2000lb_GP_Bomb_LD = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___Mk_84___2000lb_GP_Bomb_LD,
+        )
+        Pylon_3_4___Mk_20_Rockeye___490lb_CBU__247_x_HEAT_Bomblets = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___Mk_20_Rockeye___490lb_CBU__247_x_HEAT_Bomblets,
+        )
+        Pylon_4___Mk_82___500lb_GP_Bomb_LD = (
+            3,
+            WeaponsFA18EFG.Pylon_4___Mk_82___500lb_GP_Bomb_LD,
+        )
+        Pylon_4___Mk_82Y___500lb_GP_Bomb_Chute_Retarded_HD = (
+            3,
+            WeaponsFA18EFG.Pylon_4___Mk_82Y___500lb_GP_Bomb_Chute_Retarded_HD,
+        )
+        Pylon_4___Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+            3,
+            WeaponsFA18EFG.Pylon_4___Mk_82_Snakeye___500lb_GP_Bomb_HD,
+        )
+        Pylon_4___Mk_83___1000lb_GP_Bomb_LD = (
+            3,
+            WeaponsFA18EFG.Pylon_4___Mk_83___1000lb_GP_Bomb_LD,
+        )
+        Pylon_4___Mk_84___2000lb_GP_Bomb_LD = (
+            3,
+            WeaponsFA18EFG.Pylon_4___Mk_84___2000lb_GP_Bomb_LD,
+        )
+        Pylon_4___Mk_20_Rockeye___490lb_CBU__247_x_HEAT_Bomblets = (
+            3,
+            WeaponsFA18EFG.Pylon_4___Mk_20_Rockeye___490lb_CBU__247_x_HEAT_Bomblets,
+        )
+        Pylon_3_4___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb,
+        )
+        Pylon_3_4___GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb,
+        )
+        Pylon_3_4___AGM_154A___JSOW_CEB__CBU_type_ = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___AGM_154A___JSOW_CEB__CBU_type_,
+        )
+        Pylon_4___AGM_154A___JSOW_CEB__CBU_type_ = (
+            3,
+            WeaponsFA18EFG.Pylon_4___AGM_154A___JSOW_CEB__CBU_type_,
+        )
+        Pylon_3_4___AGM_154C___JSOW_Unitary_BROACH = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___AGM_154C___JSOW_Unitary_BROACH,
+        )
+        Pylon_4___AGM_154C___JSOW_Unitary_BROACH = (
+            3,
+            WeaponsFA18EFG.Pylon_4___AGM_154C___JSOW_Unitary_BROACH,
+        )
+        Pylon_3_4___GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb,
+        )
+        Pylon_3_4___GBU_12___500lb_Laser_Guided_Bomb = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___GBU_12___500lb_Laser_Guided_Bomb,
+        )
+        Pylon_4___GBU_12___500lb_Laser_Guided_Bomb = (
+            3,
+            WeaponsFA18EFG.Pylon_4___GBU_12___500lb_Laser_Guided_Bomb,
+        )
+        # ERRR {Left_Midboard_Inboard_2X_GBU_32}
+        # ERRR {Left_Midboard_Inboard_1X_GBU_32}
+        Pylon_3_4___GBU_16___1000lb_Laser_Guided_Bomb = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___GBU_16___1000lb_Laser_Guided_Bomb,
+        )
+        Pylon_4___GBU_16___1000lb_Laser_Guided_Bomb = (
+            3,
+            WeaponsFA18EFG.Pylon_4___GBU_16___1000lb_Laser_Guided_Bomb,
+        )
+        Pylon_4___GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb = (
+            3,
+            WeaponsFA18EFG.Pylon_4___GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb,
+        )
+        Pylon_4___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb = (
+            3,
+            WeaponsFA18EFG.Pylon_4___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb,
+        )
+        Pylon_4___GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb = (
+            3,
+            WeaponsFA18EFG.Pylon_4___GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb,
+        )
+        Pylon_3_4___GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb,
+        )
+        Pylon_4___GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = (
+            3,
+            WeaponsFA18EFG.Pylon_4___GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb,
+        )
+        Pylon_4___AGM_84A_Harpoon_AShM = (
+            3,
+            WeaponsFA18EFG.Pylon_4___AGM_84A_Harpoon_AShM,
+        )
+        Pylon_4___AGM_84D_Harpoon_AShM = (
+            3,
+            WeaponsFA18EFG.Pylon_4___AGM_84D_Harpoon_AShM,
+        )
+        Pylon_4___AGM_84E_Harpoon_SLAM = (
+            3,
+            WeaponsFA18EFG.Pylon_4___AGM_84E_Harpoon_SLAM,
+        )
+
+    # ERRR {Left_Inboard_1X_AGM-84H}
 
     class Pylon4:
         AIM_120B_AMRAAM___Active_Radar_AAM = (
@@ -532,342 +1153,47 @@ class FA_18E(PlaneType):
             Weapons.AN_ASQ_228_ATFLIR___Targeting_Pod,
         )
 
+    # ERRR <CLEAN>
+
     class Pylon5:
-        LAU_115C_with_AIM_7M_Sparrow_Semi_Active_Radar = (
-            5,
-            Weapons.LAU_115C_with_AIM_7M_Sparrow_Semi_Active_Radar,
-        )
-        LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar = (
-            5,
-            Weapons.LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar,
-        )
-        LAU_115C_with_AIM_7MH_Sparrow_Semi_Active_Radar = (
-            5,
-            Weapons.LAU_115C_with_AIM_7MH_Sparrow_Semi_Active_Radar,
-        )
+        AA42R_Buddy_Pod = (5, WeaponsFA18EFG.AA42R_Buddy_Pod)
         FPU_12_Fuel_Tank_480_gallons = (5, WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons)
         FPU_12_Fuel_Tank_480_gallons_High_Vis = (
             5,
             WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_High_Vis,
         )
-        LAU_115_with_1_x_LAU_127_AIM_120B_AMRAAM___Active_Radar_AAM = (
-            5,
-            Weapons.LAU_115_with_1_x_LAU_127_AIM_120B_AMRAAM___Active_Radar_AAM,
-        )
-        LAU_115_with_1_x_LAU_127_AIM_120C_AMRAAM___Active_Radar_AAM = (
-            5,
-            Weapons.LAU_115_with_1_x_LAU_127_AIM_120C_AMRAAM___Active_Radar_AAM,
-        )
-        LAU_115_2_LAU_127_AIM_120B = (5, Weapons.LAU_115_2_LAU_127_AIM_120B)
-        LAU_115_2_LAU_127_AIM_120C = (5, Weapons.LAU_115_2_LAU_127_AIM_120C)
-        LAU_117_with_AGM_65E___Maverick_E__Laser_ASM___Lg_Whd_ = (
-            5,
-            Weapons.LAU_117_with_AGM_65E___Maverick_E__Laser_ASM___Lg_Whd_,
-        )
-        LAU_117_CATM_65K = (5, Weapons.LAU_117_CATM_65K)
-        LAU_117_AGM_65F = (5, Weapons.LAU_117_AGM_65F)
-        AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_ = (
-            5,
-            Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_,
-        )
-        Mk_82___500lb_GP_Bomb_LD = (5, Weapons.Mk_82___500lb_GP_Bomb_LD)
-        Mk_82_Snakeye___500lb_GP_Bomb_HD = (
-            5,
-            Weapons.Mk_82_Snakeye___500lb_GP_Bomb_HD,
-        )
-        Mk_82Y___500lb_GP_Chute_Retarded_HD = (
-            5,
-            Weapons.Mk_82Y___500lb_GP_Chute_Retarded_HD,
-        )
-        Mk_83___1000lb_GP_Bomb_LD = (5, Weapons.Mk_83___1000lb_GP_Bomb_LD)
-        Mk_84___2000lb_GP_Bomb_LD = (5, Weapons.Mk_84___2000lb_GP_Bomb_LD)
-        AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_ = (
-            5,
-            Weapons.AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_,
-        )
-        AGM_84H_SLAM_ER__Expanded_Response_ = (
-            5,
-            Weapons.AGM_84H_SLAM_ER__Expanded_Response_,
-        )
-        BRU_33_with_2_x_Mk_82___500lb_GP_Bomb_LD = (
-            5,
-            Weapons.BRU_33_with_2_x_Mk_82___500lb_GP_Bomb_LD,
-        )
-        BRU_33_with_2_x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
-            5,
-            Weapons.BRU_33_with_2_x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
-        )
-        BRU_33_with_2_x_Mk_82Y___500lb_GP_Chute_Retarded_HD = (
-            5,
-            Weapons.BRU_33_with_2_x_Mk_82Y___500lb_GP_Chute_Retarded_HD,
-        )
-        BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
-            5,
-            Weapons.BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
-        )
-        BRU_33_with_2_x_Mk_83___1000lb_GP_Bomb_LD = (
-            5,
-            Weapons.BRU_33_with_2_x_Mk_83___1000lb_GP_Bomb_LD,
-        )
-        BRU_41A_with_6_x_BDU_33___25lb_Practice_Bomb_LD = (
-            5,
-            Weapons.BRU_41A_with_6_x_BDU_33___25lb_Practice_Bomb_LD,
-        )
-        GBU_10___2000lb_Laser_Guided_Bomb = (
-            5,
-            Weapons.GBU_10___2000lb_Laser_Guided_Bomb,
-        )
-        GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = (
-            5,
-            Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb,
-        )
-        GBU_12___500lb_Laser_Guided_Bomb = (
-            5,
-            Weapons.GBU_12___500lb_Laser_Guided_Bomb,
-        )
-        GBU_16___1000lb_Laser_Guided_Bomb = (
-            5,
-            Weapons.GBU_16___1000lb_Laser_Guided_Bomb,
-        )
-        CBU_99___490lbs__247_x_HEAT_Bomblets = (
-            5,
-            Weapons.CBU_99___490lbs__247_x_HEAT_Bomblets,
-        )
-        Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
-            5,
-            Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
-        )
-        BRU_33_with_2_x_CBU_99___490lbs__247_x_HEAT_Bomblets = (
-            5,
-            Weapons.BRU_33_with_2_x_CBU_99___490lbs__247_x_HEAT_Bomblets,
-        )
-        BRU_33_with_2_x_GBU_12___500lb_Laser_Guided_Bomb = (
-            5,
-            Weapons.BRU_33_with_2_x_GBU_12___500lb_Laser_Guided_Bomb,
-        )
-        # ERRR <CLEAN>
-        AGM_154A___JSOW_CEB__CBU_type_ = (
-            5,
-            Weapons.AGM_154A___JSOW_CEB__CBU_type_,
-        )
-        BRU_55_with_2_x_AGM_154A___JSOW_CEB__CBU_type_ = (
-            5,
-            Weapons.BRU_55_with_2_x_AGM_154A___JSOW_CEB__CBU_type_,
-        )
-        AGM_154C___JSOW_Unitary_BROACH = (
-            5,
-            Weapons.AGM_154C___JSOW_Unitary_BROACH,
-        )
-        BRU_55_with_2_x_AGM_154C___JSOW_Unitary_BROACH = (
-            5,
-            Weapons.BRU_55_with_2_x_AGM_154C___JSOW_Unitary_BROACH,
-        )
-        GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb = (
-            5,
-            Weapons.GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb,
-        )
-        GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb = (
-            5,
-            Weapons.GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb,
-        )
-        GBU_32_V_2_B___JDAM__1000lb_GPS_Guided_Bomb = (
-            5,
-            Weapons.GBU_32_V_2_B___JDAM__1000lb_GPS_Guided_Bomb,
-        )
-        GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb = (
-            5,
-            Weapons.GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb,
-        )
-        BRU_55_with_2_x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
-            5,
-            Weapons.BRU_55_with_2_x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
-        )
-        AGM_84D_Harpoon_AShM = (5, Weapons.AGM_84D_Harpoon_AShM)
         AWW_13_DATALINK_POD = (5, Weapons.AWW_13_DATALINK_POD)
-        GBU_54_V_1_B___LJDAM__500lb_Laser__GPS_Guided_Bomb_LD = (
-            5,
-            Weapons.GBU_54_V_1_B___LJDAM__500lb_Laser__GPS_Guided_Bomb_LD,
-        )
+        USAFlag_ = (5, WeaponsFA18EFG.USAFlag_)
+        Smoke_Generator___red_ = (5, Weapons.Smoke_Generator___red_)
+        Smoke_Generator___green_ = (5, Weapons.Smoke_Generator___green_)
+        Smoke_Generator___blue_ = (5, Weapons.Smoke_Generator___blue_)
+        Smoke_Generator___white_ = (5, Weapons.Smoke_Generator___white_)
+        Smoke_Generator___yellow_ = (5, Weapons.Smoke_Generator___yellow_)
+        Smoke_Generator___orange_ = (5, Weapons.Smoke_Generator___orange_)
 
     class Pylon6:
-        LAU_115C_with_AIM_7M_Sparrow_Semi_Active_Radar = (
+        AIM_120B_AMRAAM___Active_Radar_AAM = (
             6,
-            Weapons.LAU_115C_with_AIM_7M_Sparrow_Semi_Active_Radar,
+            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
         )
-        LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar = (
+        AIM_120C_AMRAAM___Active_Radar_AAM = (
             6,
-            Weapons.LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar,
-        )
-        LAU_115C_with_AIM_7MH_Sparrow_Semi_Active_Radar = (
-            6,
-            Weapons.LAU_115C_with_AIM_7MH_Sparrow_Semi_Active_Radar,
+            Weapons.AIM_120C_AMRAAM___Active_Radar_AAM,
         )
+        AWW_13_DATALINK_POD = (6, Weapons.AWW_13_DATALINK_POD)
         FPU_12_Fuel_Tank_480_gallons = (6, WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons)
         FPU_12_Fuel_Tank_480_gallons_High_Vis = (
             6,
             WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_High_Vis,
         )
-        LAU_115_with_1_x_LAU_127_AIM_120B_AMRAAM___Active_Radar_AAM = (
-            6,
-            Weapons.LAU_115_with_1_x_LAU_127_AIM_120B_AMRAAM___Active_Radar_AAM,
-        )
-        LAU_115_with_1_x_LAU_127_AIM_120C_AMRAAM___Active_Radar_AAM = (
-            6,
-            Weapons.LAU_115_with_1_x_LAU_127_AIM_120C_AMRAAM___Active_Radar_AAM,
-        )
-        LAU_115_2_LAU_127_AIM_120B = (6, Weapons.LAU_115_2_LAU_127_AIM_120B)
-        LAU_115_2_LAU_127_AIM_120C = (6, Weapons.LAU_115_2_LAU_127_AIM_120C)
-        LAU_117_with_AGM_65E___Maverick_E__Laser_ASM___Lg_Whd_ = (
-            6,
-            Weapons.LAU_117_with_AGM_65E___Maverick_E__Laser_ASM___Lg_Whd_,
-        )
-        LAU_117_CATM_65K = (6, Weapons.LAU_117_CATM_65K)
-        LAU_117_AGM_65F = (6, Weapons.LAU_117_AGM_65F)
-        AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_ = (
-            6,
-            Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_,
-        )
-        Mk_82___500lb_GP_Bomb_LD = (6, Weapons.Mk_82___500lb_GP_Bomb_LD)
-        Mk_82_Snakeye___500lb_GP_Bomb_HD = (
-            6,
-            Weapons.Mk_82_Snakeye___500lb_GP_Bomb_HD,
-        )
-        Mk_82Y___500lb_GP_Chute_Retarded_HD = (
-            6,
-            Weapons.Mk_82Y___500lb_GP_Chute_Retarded_HD,
-        )
-        Mk_83___1000lb_GP_Bomb_LD = (6, Weapons.Mk_83___1000lb_GP_Bomb_LD)
-        Mk_84___2000lb_GP_Bomb_LD = (6, Weapons.Mk_84___2000lb_GP_Bomb_LD)
-        BDU_45___500lb_Practice_Bomb = (6, Weapons.BDU_45___500lb_Practice_Bomb)
-        BDU_45B___500lb_Practice_Bomb = (
-            6,
-            Weapons.BDU_45B___500lb_Practice_Bomb,
-        )
-        AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_ = (
-            6,
-            Weapons.AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_,
-        )
-        AGM_84H_SLAM_ER__Expanded_Response_ = (
-            6,
-            Weapons.AGM_84H_SLAM_ER__Expanded_Response_,
-        )
-        BRU_33_with_2_x_Mk_82___500lb_GP_Bomb_LD = (
-            6,
-            Weapons.BRU_33_with_2_x_Mk_82___500lb_GP_Bomb_LD,
-        )
-        BRU_33_with_2_x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
-            6,
-            Weapons.BRU_33_with_2_x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
-        )
-        BRU_33_with_2_x_Mk_82Y___500lb_GP_Chute_Retarded_HD = (
-            6,
-            Weapons.BRU_33_with_2_x_Mk_82Y___500lb_GP_Chute_Retarded_HD,
-        )
-        BRU_33_with_2_x_BDU_45___500lb_Practice_Bomb = (
-            6,
-            Weapons.BRU_33_with_2_x_BDU_45___500lb_Practice_Bomb,
-        )
-        BRU_33_with_2_x_BDU_45B___500lb_Practice_Bomb = (
-            6,
-            Weapons.BRU_33_with_2_x_BDU_45B___500lb_Practice_Bomb,
-        )
-        BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
-            6,
-            Weapons.BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
-        )
-        BRU_33_with_2_x_Mk_83___1000lb_GP_Bomb_LD = (
-            6,
-            Weapons.BRU_33_with_2_x_Mk_83___1000lb_GP_Bomb_LD,
-        )
-        BRU_41A_with_6_x_BDU_33___25lb_Practice_Bomb_LD = (
-            6,
-            Weapons.BRU_41A_with_6_x_BDU_33___25lb_Practice_Bomb_LD,
-        )
-        GBU_10___2000lb_Laser_Guided_Bomb = (
-            6,
-            Weapons.GBU_10___2000lb_Laser_Guided_Bomb,
-        )
-        GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = (
-            6,
-            Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb,
-        )
-        GBU_12___500lb_Laser_Guided_Bomb = (
-            6,
-            Weapons.GBU_12___500lb_Laser_Guided_Bomb,
-        )
-        GBU_16___1000lb_Laser_Guided_Bomb = (
-            6,
-            Weapons.GBU_16___1000lb_Laser_Guided_Bomb,
-        )
-        CBU_99___490lbs__247_x_HEAT_Bomblets = (
-            6,
-            Weapons.CBU_99___490lbs__247_x_HEAT_Bomblets,
-        )
-        Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
-            6,
-            Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
-        )
-        BRU_33_with_2_x_CBU_99___490lbs__247_x_HEAT_Bomblets = (
-            6,
-            Weapons.BRU_33_with_2_x_CBU_99___490lbs__247_x_HEAT_Bomblets,
-        )
-        BRU_33_with_2_x_GBU_12___500lb_Laser_Guided_Bomb = (
-            6,
-            Weapons.BRU_33_with_2_x_GBU_12___500lb_Laser_Guided_Bomb,
-        )
-        # ERRR <CLEAN>
-        AGM_154A___JSOW_CEB__CBU_type_ = (
-            6,
-            Weapons.AGM_154A___JSOW_CEB__CBU_type_,
-        )
-        BRU_55_with_2_x_AGM_154A___JSOW_CEB__CBU_type_ = (
-            6,
-            Weapons.BRU_55_with_2_x_AGM_154A___JSOW_CEB__CBU_type_,
-        )
-        AGM_154C___JSOW_Unitary_BROACH = (
-            6,
-            Weapons.AGM_154C___JSOW_Unitary_BROACH,
-        )
-        BRU_55_with_2_x_AGM_154C___JSOW_Unitary_BROACH = (
-            6,
-            Weapons.BRU_55_with_2_x_AGM_154C___JSOW_Unitary_BROACH,
-        )
-        GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb = (
-            6,
-            Weapons.GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb,
-        )
-        GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb = (
-            6,
-            Weapons.GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb,
-        )
-        GBU_32_V_2_B___JDAM__1000lb_GPS_Guided_Bomb = (
-            6,
-            Weapons.GBU_32_V_2_B___JDAM__1000lb_GPS_Guided_Bomb,
-        )
-        GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb = (
-            6,
-            Weapons.GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb,
-        )
-        BRU_55_with_2_x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
-            6,
-            Weapons.BRU_55_with_2_x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
-        )
-        AGM_84D_Harpoon_AShM = (6, Weapons.AGM_84D_Harpoon_AShM)
-        AWW_13_DATALINK_POD = (6, Weapons.AWW_13_DATALINK_POD)
-        GBU_54_V_1_B___LJDAM__500lb_Laser__GPS_Guided_Bomb_LD = (
-            6,
-            Weapons.GBU_54_V_1_B___LJDAM__500lb_Laser__GPS_Guided_Bomb_LD,
-        )
+
+    # ERRR <CLEAN>
 
     class Pylon7:
-        LAU_115_2_LAU_127_AIM_9M = (7, Weapons.LAU_115_2_LAU_127_AIM_9M)
-        LAU_115_2_LAU_127_CATM_9M = (7, Weapons.LAU_115_2_LAU_127_CATM_9M)
-        LAU_115_2_LAU_127_AIM_9L = (7, Weapons.LAU_115_2_LAU_127_AIM_9L)
-        LAU_115_2_LAU_127_AIM_9X = (7, Weapons.LAU_115_2_LAU_127_AIM_9X)
-        LAU_115_LAU_127_AIM_9X = (7, Weapons.LAU_115_LAU_127_AIM_9X)
-        LAU_115_LAU_127_CATM_9M = (7, Weapons.LAU_115_LAU_127_CATM_9M)
-        LAU_115_LAU_127_AIM_9L = (7, Weapons.LAU_115_LAU_127_AIM_9L)
-        LAU_115_LAU_127_AIM_9M = (7, Weapons.LAU_115_LAU_127_AIM_9M)
+        ALQ_167 = (7, WeaponsFA18EFG.ALQ_167)
+        LAU_115_2_LAU_127_AIM_120B = (7, Weapons.LAU_115_2_LAU_127_AIM_120B)
+        LAU_115_2_LAU_127_AIM_120C = (7, Weapons.LAU_115_2_LAU_127_AIM_120C)
+        # ERRR LAU-115_2*LAU-127_CATM-120C
         LAU_115C_with_AIM_7M_Sparrow_Semi_Active_Radar = (
             7,
             Weapons.LAU_115C_with_AIM_7M_Sparrow_Semi_Active_Radar,
@@ -889,17 +1215,6 @@ class FA_18E(PlaneType):
             7,
             WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_High_Vis,
         )
-        AIM_120B_AMRAAM___Active_Radar_AAM = (
-            7,
-            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
-        )
-        AIM_120C_AMRAAM___Active_Radar_AAM = (
-            7,
-            Weapons.AIM_120C_AMRAAM___Active_Radar_AAM,
-        )
-        LAU_115_2_LAU_127_AIM_120B = (7, Weapons.LAU_115_2_LAU_127_AIM_120B)
-        LAU_115_2_LAU_127_AIM_120C = (7, Weapons.LAU_115_2_LAU_127_AIM_120C)
-        # ERRR LAU-115_2*LAU-127_CATM-120C
         # ERRR LAU_117_TGM_65E
         # ERRR LAU_117_TGM_65F
         LAU_117_with_AGM_65E___Maverick_E__Laser_ASM___Lg_Whd_ = (
@@ -913,48 +1228,34 @@ class FA_18E(PlaneType):
             Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_,
         )
         Mk_82___500lb_GP_Bomb_LD = (7, Weapons.Mk_82___500lb_GP_Bomb_LD)
-        Mk_82_Snakeye___500lb_GP_Bomb_HD = (
-            7,
-            Weapons.Mk_82_Snakeye___500lb_GP_Bomb_HD,
-        )
+        Mk_82_Snakeye___500lb_GP_Bomb_HD = (7, Weapons.Mk_82_Snakeye___500lb_GP_Bomb_HD)
         Mk_82Y___500lb_GP_Chute_Retarded_HD = (
             7,
             Weapons.Mk_82Y___500lb_GP_Chute_Retarded_HD,
         )
-        Mk_83___1000lb_GP_Bomb_LD = (7, Weapons.Mk_83___1000lb_GP_Bomb_LD)
-        Mk_84___2000lb_GP_Bomb_LD = (7, Weapons.Mk_84___2000lb_GP_Bomb_LD)
-        BDU_45___500lb_Practice_Bomb = (7, Weapons.BDU_45___500lb_Practice_Bomb)
-        BDU_45B___500lb_Practice_Bomb = (
+        Pylon_8___Mk_82_Snakeye___500lb_GP_Bomb_HD = (
             7,
-            Weapons.BDU_45B___500lb_Practice_Bomb,
-        )
-        AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_ = (
-            7,
-            Weapons.AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_,
-        )
-        AGM_84H_SLAM_ER__Expanded_Response_ = (
-            7,
-            Weapons.AGM_84H_SLAM_ER__Expanded_Response_,
+            WeaponsFA18EFG.Pylon_8___Mk_82_Snakeye___500lb_GP_Bomb_HD,
         )
         BRU_33_with_2_x_Mk_82___500lb_GP_Bomb_LD = (
             7,
-            Weapons.BRU_33_with_2_x_Mk_82___500lb_GP_Bomb_LD,
+            WeaponsFA18EFG.Pylon_8___Mk_83___1000lb_GP_Bomb_LD,
         )
-        BRU_33_with_2_x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+        Pylon_8___Mk_84___2000lb_GP_Bomb_LD = (
             7,
-            Weapons.BRU_33_with_2_x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
+            WeaponsFA18EFG.Pylon_8___Mk_84___2000lb_GP_Bomb_LD,
         )
-        BRU_33_with_2_x_Mk_82Y___500lb_GP_Chute_Retarded_HD = (
+        Pylon_8___Mk_20_Rockeye___490lb_CBU__247_x_HEAT_Bomblets = (
             7,
-            Weapons.BRU_33_with_2_x_Mk_82Y___500lb_GP_Chute_Retarded_HD,
+            WeaponsFA18EFG.Pylon_8___Mk_20_Rockeye___490lb_CBU__247_x_HEAT_Bomblets,
         )
-        BRU_33_with_2_x_BDU_45___500lb_Practice_Bomb = (
+        Pylon_9_8___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb = (
             7,
-            Weapons.BRU_33_with_2_x_BDU_45___500lb_Practice_Bomb,
+            WeaponsFA18EFG.Pylon_9_8___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb,
         )
-        BRU_33_with_2_x_BDU_45B___500lb_Practice_Bomb = (
+        Pylon_9_8___GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb = (
             7,
-            Weapons.BRU_33_with_2_x_BDU_45B___500lb_Practice_Bomb,
+            WeaponsFA18EFG.Pylon_9_8___GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb,
         )
         BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             7,
@@ -972,11 +1273,12 @@ class FA_18E(PlaneType):
             7,
             Weapons.GBU_10___2000lb_Laser_Guided_Bomb,
         )
-        GBU_12___500lb_Laser_Guided_Bomb = (
+
+        BRU_41A_with_6_x_BDU_33___25lb_Practice_Bomb_LD = (
             7,
-            Weapons.GBU_12___500lb_Laser_Guided_Bomb,
+            Weapons.BRU_41A_with_6_x_BDU_33___25lb_Practice_Bomb_LD,
         )
-        GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = (
+        Pylon_9_8___GBU_12___500lb_Laser_Guided_Bomb = (
             7,
             Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb,
         )
@@ -984,40 +1286,19 @@ class FA_18E(PlaneType):
             7,
             Weapons.GBU_16___1000lb_Laser_Guided_Bomb,
         )
-        CBU_99___490lbs__247_x_HEAT_Bomblets = (
-            7,
-            Weapons.CBU_99___490lbs__247_x_HEAT_Bomblets,
-        )
         Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             7,
             Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
-        BRU_33_with_2_x_CBU_99___490lbs__247_x_HEAT_Bomblets = (
-            7,
-            Weapons.BRU_33_with_2_x_CBU_99___490lbs__247_x_HEAT_Bomblets,
-        )
         BRU_33_with_2_x_GBU_12___500lb_Laser_Guided_Bomb = (
             7,
             Weapons.BRU_33_with_2_x_GBU_12___500lb_Laser_Guided_Bomb,
         )
-        # ERRR <CLEAN>
-        AGM_154A___JSOW_CEB__CBU_type_ = (
+        Pylon_8___GBU_12___500lb_Laser_Guided_Bomb = (
             7,
-            Weapons.AGM_154A___JSOW_CEB__CBU_type_,
+            WeaponsFA18EFG.Pylon_8___GBU_12___500lb_Laser_Guided_Bomb,
         )
-        BRU_55_with_2_x_AGM_154A___JSOW_CEB__CBU_type_ = (
-            7,
-            Weapons.BRU_55_with_2_x_AGM_154A___JSOW_CEB__CBU_type_,
-        )
-        AGM_154C___JSOW_Unitary_BROACH = (
-            7,
-            Weapons.AGM_154C___JSOW_Unitary_BROACH,
-        )
-        BRU_55_with_2_x_AGM_154C___JSOW_Unitary_BROACH = (
-            7,
-            Weapons.BRU_55_with_2_x_AGM_154C___JSOW_Unitary_BROACH,
-        )
-        GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb = (
+        Pylon_8___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb = (
             7,
             Weapons.GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb,
         )
@@ -1041,17 +1322,10 @@ class FA_18E(PlaneType):
         AWW_13_DATALINK_POD = (7, Weapons.AWW_13_DATALINK_POD)
         GBU_54_V_1_B___LJDAM__500lb_Laser__GPS_Guided_Bomb_LD = (
             7,
-            Weapons.GBU_54_V_1_B___LJDAM__500lb_Laser__GPS_Guided_Bomb_LD,
+            WeaponsFA18EFG.Pylon_8___AGM_84E_Harpoon_SLAM,
         )
-        BRU_42_with_3_x_ADM_141A_TALD = (
-            7,
-            Weapons.BRU_42_with_3_x_ADM_141A_TALD,
-        )
-        BRU_42_with_2_x_ADM_141A_TALD = (
-            7,
-            Weapons.BRU_42_with_2_x_ADM_141A_TALD,
-        )
-        BRU_42_with_ADM_141A_TALD = (7, Weapons.BRU_42_with_ADM_141A_TALD)
+
+    # ERRR {Right_Inboard_1X_AGM-84H}
 
     class Pylon8:
         TLAU_127 = (8, WeaponsFA18EFG.TLAU_127)
@@ -1059,27 +1333,101 @@ class FA_18E(PlaneType):
             8,
             Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
         )
-        AIM_120C_AMRAAM___Active_Radar_AAM = (
-            8,
-            Weapons.AIM_120C_AMRAAM___Active_Radar_AAM,
+        Pylon_8___Mk_83___1000lb_GP_Bomb_LD = (
+            7,
+            WeaponsFA18EFG.Pylon_8___Mk_83___1000lb_GP_Bomb_LD,
         )
-        # ERRR {CATM-120C}
-        LAU_115C_with_AIM_7M_Sparrow_Semi_Active_Radar = (
-            8,
-            Weapons.LAU_115C_with_AIM_7M_Sparrow_Semi_Active_Radar,
+        Pylon_8___Mk_84___2000lb_GP_Bomb_LD = (
+            7,
+            WeaponsFA18EFG.Pylon_8___Mk_84___2000lb_GP_Bomb_LD,
         )
-        LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar = (
-            8,
-            Weapons.LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar,
+        Pylon_8___Mk_20_Rockeye___490lb_CBU__247_x_HEAT_Bomblets = (
+            7,
+            WeaponsFA18EFG.Pylon_8___Mk_20_Rockeye___490lb_CBU__247_x_HEAT_Bomblets,
         )
-        LAU_115C_with_AIM_7MH_Sparrow_Semi_Active_Radar = (
-            8,
-            Weapons.LAU_115C_with_AIM_7MH_Sparrow_Semi_Active_Radar,
+        Pylon_9_8___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb = (
+            7,
+            WeaponsFA18EFG.Pylon_9_8___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb,
         )
-        LAU_115C_with_AIM_7P_Sparrow_Semi_Active_Radar = (
-            8,
-            Weapons.LAU_115C_with_AIM_7P_Sparrow_Semi_Active_Radar,
+        Pylon_9_8___GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb = (
+            7,
+            WeaponsFA18EFG.Pylon_9_8___GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb,
         )
+        Pylon_9_8___AGM_154A___JSOW_CEB__CBU_type_ = (
+            7,
+            WeaponsFA18EFG.Pylon_9_8___AGM_154A___JSOW_CEB__CBU_type_,
+        )
+        Pylon_8___AGM_154A___JSOW_CEB__CBU_type_ = (
+            7,
+            WeaponsFA18EFG.Pylon_8___AGM_154A___JSOW_CEB__CBU_type_,
+        )
+        Pylon_9_8___AGM_154C___JSOW_Unitary_BROACH = (
+            7,
+            WeaponsFA18EFG.Pylon_9_8___AGM_154C___JSOW_Unitary_BROACH,
+        )
+        Pylon_8___AGM_154C___JSOW_Unitary_BROACH = (
+            7,
+            WeaponsFA18EFG.Pylon_8___AGM_154C___JSOW_Unitary_BROACH,
+        )
+        Pylon_9_8___GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb = (
+            7,
+            WeaponsFA18EFG.Pylon_9_8___GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb,
+        )
+        Pylon_9_8___GBU_12___500lb_Laser_Guided_Bomb = (
+            7,
+            WeaponsFA18EFG.Pylon_9_8___GBU_12___500lb_Laser_Guided_Bomb,
+        )
+        Pylon_8___GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb = (
+            7,
+            WeaponsFA18EFG.Pylon_8___GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb,
+        )
+        # ERRR {Right_Midboard_Inboard_2X_GBU_32}
+        # ERRR {Right_Midboard_Inboard_1X_GBU_32}
+        Pylon_9_8___GBU_16___1000lb_Laser_Guided_Bomb = (
+            7,
+            WeaponsFA18EFG.Pylon_9_8___GBU_16___1000lb_Laser_Guided_Bomb,
+        )
+        Pylon_8___GBU_16___1000lb_Laser_Guided_Bomb = (
+            7,
+            WeaponsFA18EFG.Pylon_8___GBU_16___1000lb_Laser_Guided_Bomb,
+        )
+        Pylon_8___GBU_12___500lb_Laser_Guided_Bomb = (
+            7,
+            WeaponsFA18EFG.Pylon_8___GBU_12___500lb_Laser_Guided_Bomb,
+        )
+        Pylon_8___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb = (
+            7,
+            WeaponsFA18EFG.Pylon_8___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb,
+        )
+        Pylon_8___GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb = (
+            7,
+            WeaponsFA18EFG.Pylon_8___GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb,
+        )
+        Pylon_9_8___GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = (
+            7,
+            WeaponsFA18EFG.Pylon_9_8___GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb,
+        )
+        Pylon_8___GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = (
+            7,
+            WeaponsFA18EFG.Pylon_8___GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb,
+        )
+        Pylon_8___AGM_84A_Harpoon_AShM = (
+            7,
+            WeaponsFA18EFG.Pylon_8___AGM_84A_Harpoon_AShM,
+        )
+        Pylon_8___AGM_84D_Harpoon_AShM = (
+            7,
+            WeaponsFA18EFG.Pylon_8___AGM_84D_Harpoon_AShM,
+        )
+        Pylon_8___AGM_84E_Harpoon_SLAM = (
+            7,
+            WeaponsFA18EFG.Pylon_8___AGM_84E_Harpoon_SLAM,
+        )
+
+    # ERRR {Right_Inboard_1X_AGM-84H}
+
+    class Pylon8:
+        TLAU_127 = (8, WeaponsFA18EFG.TLAU_127)
         # ERRR LAU_117_TGM_65E
         # ERRR LAU_117_TGM_65F
         LAU_117_with_AGM_65E___Maverick_E__Laser_ASM___Lg_Whd_ = (
@@ -1135,11 +1483,51 @@ class FA_18E(PlaneType):
             8,
             Weapons.GBU_54_V_1_B___LJDAM__500lb_Laser__GPS_Guided_Bomb_LD,
         )
-        BRU_42_with_2_x_ADM_141A_TALD = (
-            8,
-            Weapons.BRU_42_with_2_x_ADM_141A_TALD,
-        )
+        BRU_42_with_2_x_ADM_141A_TALD = (8, Weapons.BRU_42_with_2_x_ADM_141A_TALD)
         BRU_42_with_ADM_141A_TALD = (8, Weapons.BRU_42_with_ADM_141A_TALD)
+        AN_ASQ_T50_TCTS_Pod___ACMI_Pod = (8, Weapons.AN_ASQ_T50_TCTS_Pod___ACMI_Pod)
+        AIM_120B_AMRAAM___Active_Radar_AAM = (
+            8,
+            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
+        )
+        AIM_120C_AMRAAM___Active_Radar_AAM = (
+            8,
+            Weapons.AIM_120C_AMRAAM___Active_Radar_AAM,
+        )
+        AIM_9X_Sidewinder_IR_AAM = (8, Weapons.AIM_9X_Sidewinder_IR_AAM)
+        # ERRR {CATM-120C}
+        Pylon_10_8___GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
+            8,
+            WeaponsFA18EFG.Pylon_10_8___GBU_38___JDAM__500lb_GPS_Guided_Bomb,
+        )
+        Pylon_10_8___Mk_82___500lb_GP_Bomb_LD = (
+            8,
+            WeaponsFA18EFG.Pylon_10_8___Mk_82___500lb_GP_Bomb_LD,
+        )
+        Pylon_10_8___Mk_82Y___500lb_GP_Chute_Retarded_HD = (
+            8,
+            WeaponsFA18EFG.Pylon_10_8___Mk_82Y___500lb_GP_Chute_Retarded_HD,
+        )
+        Pylon_10_8___Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+            8,
+            WeaponsFA18EFG.Pylon_10_8___Mk_82_Snakeye___500lb_GP_Bomb_HD,
+        )
+        Pylon_10_8___Mk_83___1000lb_GP_Bomb_LD = (
+            8,
+            WeaponsFA18EFG.Pylon_10_8___Mk_83___1000lb_GP_Bomb_LD,
+        )
+        Pylon_10_8___GBU_12___500lb_Laser_Guided_Bomb = (
+            8,
+            WeaponsFA18EFG.Pylon_10_8___GBU_12___500lb_Laser_Guided_Bomb,
+        )
+        Pylon_10_8___GBU_16___1000lb_Laser_Guided_Bomb = (
+            8,
+            WeaponsFA18EFG.Pylon_10_8___GBU_16___1000lb_Laser_Guided_Bomb,
+        )
+        Pylon_10_8___Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
+            8,
+            WeaponsFA18EFG.Pylon_10_8___Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
+        )
 
     class Pylon9:
         AIM_9M_Sidewinder_IR_AAM = (9, Weapons.AIM_9M_Sidewinder_IR_AAM)
@@ -1147,27 +1535,16 @@ class FA_18E(PlaneType):
         # ERRR {CATM-9M}
         # ERRR {CATM-9X}
         AIM_9X_Sidewinder_IR_AAM = (9, Weapons.AIM_9X_Sidewinder_IR_AAM)
-        AN_ASQ_T50_TCTS_Pod___ACMI_Pod = (
-            9,
-            Weapons.AN_ASQ_T50_TCTS_Pod___ACMI_Pod,
-        )
-
-    # ERRR <CLEAN>
+        AN_ASQ_T50_TCTS_Pod___ACMI_Pod = (9, Weapons.AN_ASQ_T50_TCTS_Pod___ACMI_Pod)
 
     class Pylon10:
-        AA42R_Buddy_Pod = (10, WeaponsFA18EFG.AA42R_Buddy_Pod)
         FPU_12_Fuel_Tank_480_gallons = (10, WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons)
         FPU_12_Fuel_Tank_480_gallons_High_Vis = (
             10,
             WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_High_Vis,
         )
-        USAFlag = (10, WeaponsFA18EFG.USAFlag)
-        Smoke_Generator___red_ = (10, Weapons.Smoke_Generator___red_)
-        Smoke_Generator___green_ = (10, Weapons.Smoke_Generator___green_)
-        Smoke_Generator___blue_ = (10, Weapons.Smoke_Generator___blue_)
-        Smoke_Generator___white_ = (10, Weapons.Smoke_Generator___white_)
-        Smoke_Generator___yellow_ = (10, Weapons.Smoke_Generator___yellow_)
-        Smoke_Generator___orange_ = (10, Weapons.Smoke_Generator___orange_)
+
+    # ERRR <CLEAN>
 
     pylons: Set[int] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}
 
@@ -1188,6 +1565,9 @@ class FA_18E(PlaneType):
     task_default = task.CAP
 
 
+from typing import Dict, List, Any
+
+
 @planemod
 class FA_18F(PlaneType):
     id = "FA-18F"
@@ -1278,9 +1658,6 @@ class FA_18F(PlaneType):
         "OuterBoard": 0,
         "InnerBoard": 0,
         "HelmetMountedDevice": 1,
-        "VoiceCallsignLabel": None,
-        "VoiceCallsignNumber": None,
-        "STN_L16": None,
     }
 
     class Properties:
@@ -1306,80 +1683,6 @@ class FA_18F(PlaneType):
                 JHMCS = 1
                 NVG = 2
 
-        class VoiceCallsignLabel:
-            id = "VoiceCallsignLabel"
-
-        class VoiceCallsignNumber:
-            id = "VoiceCallsignNumber"
-
-        class STN_L16:
-            id = "STN_L16"
-
-    properties = {
-        "OuterBoard": UnitPropertyDescription(
-            identifier="OuterBoard",
-            control="comboList",
-            label="Outerboard rockets mode",
-            player_only=True,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "Single",
-                1: "Ripple",
-            },
-        ),
-        "InnerBoard": UnitPropertyDescription(
-            identifier="InnerBoard",
-            control="comboList",
-            label="Innerboard rockets mode",
-            player_only=True,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "Single",
-                1: "Ripple",
-            },
-        ),
-        "HelmetMountedDevice": UnitPropertyDescription(
-            identifier="HelmetMountedDevice",
-            control="comboList",
-            label="Helmet Mounted Device",
-            player_only=True,
-            default=1,
-            w_ctrl=150,
-            values={
-                0: "Not installed",
-                1: "JHMCS",
-                2: "NVG",
-            },
-        ),
-        "datalink_Label": UnitPropertyDescription(
-            identifier="datalink_Label",
-            control="label",
-            label="DATALINK",
-            player_only=False,
-            x_lbl=150,
-        ),
-        "VoiceCallsignLabel": UnitPropertyDescription(
-            identifier="VoiceCallsignLabel",
-            control="editbox",
-            label="Voice Callsign Label",
-            player_only=False,
-        ),
-        "VoiceCallsignNumber": UnitPropertyDescription(
-            identifier="VoiceCallsignNumber",
-            control="editbox",
-            label="Voice Callsign Number",
-            player_only=False,
-        ),
-        "STN_L16": UnitPropertyDescription(
-            identifier="STN_L16",
-            control="editbox",
-            label="STN",
-            player_only=False,
-        ),
-    }
-
     livery_name = "FA-18F"  # from type
 
     class Pylon1:
@@ -1395,31 +1698,6 @@ class FA_18F(PlaneType):
 
     class Pylon2:
         TLAU_127 = (2, WeaponsFA18EFG.TLAU_127)
-        AIM_120B_AMRAAM___Active_Radar_AAM = (
-            2,
-            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
-        )
-        AIM_120C_AMRAAM___Active_Radar_AAM = (
-            2,
-            Weapons.AIM_120C_AMRAAM___Active_Radar_AAM,
-        )
-        # ERRR {CATM-120C}
-        LAU_115C_with_AIM_7M_Sparrow_Semi_Active_Radar = (
-            2,
-            Weapons.LAU_115C_with_AIM_7M_Sparrow_Semi_Active_Radar,
-        )
-        LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar = (
-            2,
-            Weapons.LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar,
-        )
-        LAU_115C_with_AIM_7MH_Sparrow_Semi_Active_Radar = (
-            2,
-            Weapons.LAU_115C_with_AIM_7MH_Sparrow_Semi_Active_Radar,
-        )
-        LAU_115C_with_AIM_7P_Sparrow_Semi_Active_Radar = (
-            2,
-            Weapons.LAU_115C_with_AIM_7P_Sparrow_Semi_Active_Radar,
-        )
         # ERRR LAU_117_TGM_65E
         # ERRR LAU_117_TGM_65F
         LAU_117_with_AGM_65E___Maverick_E__Laser_ASM___Lg_Whd_ = (
@@ -1475,21 +1753,57 @@ class FA_18F(PlaneType):
             2,
             Weapons.GBU_54_V_1_B___LJDAM__500lb_Laser__GPS_Guided_Bomb_LD,
         )
-        BRU_42_with_2_x_ADM_141A_TALD = (
-            2,
-            Weapons.BRU_42_with_2_x_ADM_141A_TALD,
-        )
+        BRU_42_with_2_x_ADM_141A_TALD = (2, Weapons.BRU_42_with_2_x_ADM_141A_TALD)
         BRU_42_with_ADM_141A_TALD = (2, Weapons.BRU_42_with_ADM_141A_TALD)
+        AN_ASQ_T50_TCTS_Pod___ACMI_Pod = (2, Weapons.AN_ASQ_T50_TCTS_Pod___ACMI_Pod)
+        AIM_120B_AMRAAM___Active_Radar_AAM = (
+            2,
+            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
+        )
+        AIM_120C_AMRAAM___Active_Radar_AAM = (
+            2,
+            Weapons.AIM_120C_AMRAAM___Active_Radar_AAM,
+        )
+        AIM_9X_Sidewinder_IR_AAM = (2, Weapons.AIM_9X_Sidewinder_IR_AAM)
+        # ERRR {CATM-120C}
+        Pylon_2_4___GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
+            2,
+            WeaponsFA18EFG.Pylon_2_4___GBU_38___JDAM__500lb_GPS_Guided_Bomb,
+        )
+        Pylon_2_4___Mk_82___500lb_GP_Bomb_LD = (
+            2,
+            WeaponsFA18EFG.Pylon_2_4___Mk_82___500lb_GP_Bomb_LD,
+        )
+        Pylon_2_4___Mk_82Y___500lb_GP_Chute_Retarded_HD = (
+            2,
+            WeaponsFA18EFG.Pylon_2_4___Mk_82Y___500lb_GP_Chute_Retarded_HD,
+        )
+        Pylon_2_4___Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+            2,
+            WeaponsFA18EFG.Pylon_2_4___Mk_82_Snakeye___500lb_GP_Bomb_HD,
+        )
+        Pylon_2_4___Mk_83___1000lb_GP_Bomb_LD = (
+            2,
+            WeaponsFA18EFG.Pylon_2_4___Mk_83___1000lb_GP_Bomb_LD,
+        )
+        Pylon_2_4___GBU_12___500lb_Laser_Guided_Bomb = (
+            2,
+            WeaponsFA18EFG.Pylon_2_4___GBU_12___500lb_Laser_Guided_Bomb,
+        )
+        Pylon_2_4___GBU_16___1000lb_Laser_Guided_Bomb = (
+            2,
+            WeaponsFA18EFG.Pylon_2_4___GBU_16___1000lb_Laser_Guided_Bomb,
+        )
+        Pylon_2_4___Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
+            2,
+            WeaponsFA18EFG.Pylon_2_4___Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
+        )
 
     class Pylon3:
-        LAU_115_2_LAU_127_AIM_9M = (3, Weapons.LAU_115_2_LAU_127_AIM_9M)
-        LAU_115_2_LAU_127_CATM_9M = (3, Weapons.LAU_115_2_LAU_127_CATM_9M)
-        LAU_115_2_LAU_127_AIM_9L = (3, Weapons.LAU_115_2_LAU_127_AIM_9L)
-        LAU_115_2_LAU_127_AIM_9X = (3, Weapons.LAU_115_2_LAU_127_AIM_9X)
-        LAU_115_LAU_127_AIM_9X = (3, Weapons.LAU_115_LAU_127_AIM_9X)
-        LAU_115_LAU_127_CATM_9M = (3, Weapons.LAU_115_LAU_127_CATM_9M)
-        LAU_115_LAU_127_AIM_9L = (3, Weapons.LAU_115_LAU_127_AIM_9L)
-        LAU_115_LAU_127_AIM_9M = (3, Weapons.LAU_115_LAU_127_AIM_9M)
+        ALQ_167 = (3, WeaponsFA18EFG.ALQ_167)
+        LAU_115_2_LAU_127_AIM_120B = (3, Weapons.LAU_115_2_LAU_127_AIM_120B)
+        LAU_115_2_LAU_127_AIM_120C = (3, Weapons.LAU_115_2_LAU_127_AIM_120C)
+        # ERRR LAU-115_2*LAU-127_CATM-120C
         LAU_115C_with_AIM_7M_Sparrow_Semi_Active_Radar = (
             3,
             Weapons.LAU_115C_with_AIM_7M_Sparrow_Semi_Active_Radar,
@@ -1511,17 +1825,6 @@ class FA_18F(PlaneType):
             3,
             WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_High_Vis,
         )
-        AIM_120B_AMRAAM___Active_Radar_AAM = (
-            3,
-            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
-        )
-        AIM_120C_AMRAAM___Active_Radar_AAM = (
-            3,
-            Weapons.AIM_120C_AMRAAM___Active_Radar_AAM,
-        )
-        LAU_115_2_LAU_127_AIM_120B = (3, Weapons.LAU_115_2_LAU_127_AIM_120B)
-        LAU_115_2_LAU_127_AIM_120C = (3, Weapons.LAU_115_2_LAU_127_AIM_120C)
-        # ERRR LAU-115_2*LAU-127_CATM-120C
         # ERRR LAU_117_TGM_65E
         # ERRR LAU_117_TGM_65F
         LAU_117_with_AGM_65E___Maverick_E__Laser_ASM___Lg_Whd_ = (
@@ -1558,34 +1861,6 @@ class FA_18F(PlaneType):
             3,
             Weapons.AGM_84H_SLAM_ER__Expanded_Response_,
         )
-        BRU_33_with_2_x_Mk_82___500lb_GP_Bomb_LD = (
-            3,
-            Weapons.BRU_33_with_2_x_Mk_82___500lb_GP_Bomb_LD,
-        )
-        BRU_33_with_2_x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
-            3,
-            Weapons.BRU_33_with_2_x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
-        )
-        BRU_33_with_2_x_Mk_82Y___500lb_GP_Chute_Retarded_HD = (
-            3,
-            Weapons.BRU_33_with_2_x_Mk_82Y___500lb_GP_Chute_Retarded_HD,
-        )
-        BRU_33_with_2_x_BDU_45___500lb_Practice_Bomb = (
-            3,
-            Weapons.BRU_33_with_2_x_BDU_45___500lb_Practice_Bomb,
-        )
-        BRU_33_with_2_x_BDU_45B___500lb_Practice_Bomb = (
-            3,
-            Weapons.BRU_33_with_2_x_BDU_45B___500lb_Practice_Bomb,
-        )
-        BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
-            3,
-            Weapons.BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
-        )
-        BRU_33_with_2_x_Mk_83___1000lb_GP_Bomb_LD = (
-            3,
-            Weapons.BRU_33_with_2_x_Mk_83___1000lb_GP_Bomb_LD,
-        )
         BRU_41A_with_6_x_BDU_33___25lb_Practice_Bomb_LD = (
             3,
             Weapons.BRU_41A_with_6_x_BDU_33___25lb_Practice_Bomb_LD,
@@ -1594,10 +1869,7 @@ class FA_18F(PlaneType):
             3,
             Weapons.GBU_10___2000lb_Laser_Guided_Bomb,
         )
-        GBU_12___500lb_Laser_Guided_Bomb = (
-            3,
-            Weapons.GBU_12___500lb_Laser_Guided_Bomb,
-        )
+        GBU_12___500lb_Laser_Guided_Bomb = (3, Weapons.GBU_12___500lb_Laser_Guided_Bomb)
         GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = (
             3,
             Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb,
@@ -1606,18 +1878,10 @@ class FA_18F(PlaneType):
             3,
             Weapons.GBU_16___1000lb_Laser_Guided_Bomb,
         )
-        CBU_99___490lbs__247_x_HEAT_Bomblets = (
-            3,
-            Weapons.CBU_99___490lbs__247_x_HEAT_Bomblets,
-        )
         Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             3,
             Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
-        BRU_33_with_2_x_CBU_99___490lbs__247_x_HEAT_Bomblets = (
-            3,
-            Weapons.BRU_33_with_2_x_CBU_99___490lbs__247_x_HEAT_Bomblets,
-        )
         BRU_33_with_2_x_GBU_12___500lb_Laser_Guided_Bomb = (
             3,
             Weapons.BRU_33_with_2_x_GBU_12___500lb_Laser_Guided_Bomb,
@@ -1674,6 +1938,134 @@ class FA_18F(PlaneType):
             Weapons.BRU_42_with_2_x_ADM_141A_TALD,
         )
         BRU_42_with_ADM_141A_TALD = (3, Weapons.BRU_42_with_ADM_141A_TALD)
+        Pylon_3_4___Mk_82___500lb_GP_Bomb_LD = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___Mk_82___500lb_GP_Bomb_LD,
+        )
+        Pylon_3_4___Mk_82Y___500lb_GP_Bomb_Chute_Retarded_HD = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___Mk_82Y___500lb_GP_Bomb_Chute_Retarded_HD,
+        )
+        Pylon_3_4___Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___Mk_82_Snakeye___500lb_GP_Bomb_HD,
+        )
+        Pylon_3_4___Mk_83___1000lb_GP_Bomb_LD = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___Mk_83___1000lb_GP_Bomb_LD,
+        )
+        Pylon_3_4___Mk_84___2000lb_GP_Bomb_LD = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___Mk_84___2000lb_GP_Bomb_LD,
+        )
+        Pylon_3_4___Mk_20_Rockeye___490lb_CBU__247_x_HEAT_Bomblets = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___Mk_20_Rockeye___490lb_CBU__247_x_HEAT_Bomblets,
+        )
+        Pylon_4___Mk_82___500lb_GP_Bomb_LD = (
+            3,
+            WeaponsFA18EFG.Pylon_4___Mk_82___500lb_GP_Bomb_LD,
+        )
+        Pylon_4___Mk_82Y___500lb_GP_Bomb_Chute_Retarded_HD = (
+            3,
+            WeaponsFA18EFG.Pylon_4___Mk_82Y___500lb_GP_Bomb_Chute_Retarded_HD,
+        )
+        Pylon_4___Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+            3,
+            WeaponsFA18EFG.Pylon_4___Mk_82_Snakeye___500lb_GP_Bomb_HD,
+        )
+        Pylon_4___Mk_83___1000lb_GP_Bomb_LD = (
+            3,
+            WeaponsFA18EFG.Pylon_4___Mk_83___1000lb_GP_Bomb_LD,
+        )
+        Pylon_4___Mk_84___2000lb_GP_Bomb_LD = (
+            3,
+            WeaponsFA18EFG.Pylon_4___Mk_84___2000lb_GP_Bomb_LD,
+        )
+        Pylon_4___Mk_20_Rockeye___490lb_CBU__247_x_HEAT_Bomblets = (
+            3,
+            WeaponsFA18EFG.Pylon_4___Mk_20_Rockeye___490lb_CBU__247_x_HEAT_Bomblets,
+        )
+        Pylon_3_4___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb,
+        )
+        Pylon_3_4___GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb,
+        )
+        Pylon_3_4___AGM_154A___JSOW_CEB__CBU_type_ = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___AGM_154A___JSOW_CEB__CBU_type_,
+        )
+        Pylon_4___AGM_154A___JSOW_CEB__CBU_type_ = (
+            3,
+            WeaponsFA18EFG.Pylon_4___AGM_154A___JSOW_CEB__CBU_type_,
+        )
+        Pylon_3_4___AGM_154C___JSOW_Unitary_BROACH = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___AGM_154C___JSOW_Unitary_BROACH,
+        )
+        Pylon_4___AGM_154C___JSOW_Unitary_BROACH = (
+            3,
+            WeaponsFA18EFG.Pylon_4___AGM_154C___JSOW_Unitary_BROACH,
+        )
+        Pylon_3_4___GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb,
+        )
+        Pylon_3_4___GBU_12___500lb_Laser_Guided_Bomb = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___GBU_12___500lb_Laser_Guided_Bomb,
+        )
+        Pylon_4___GBU_12___500lb_Laser_Guided_Bomb = (
+            3,
+            WeaponsFA18EFG.Pylon_4___GBU_12___500lb_Laser_Guided_Bomb,
+        )
+        # ERRR {Left_Midboard_Inboard_2X_GBU_32}
+        # ERRR {Left_Midboard_Inboard_1X_GBU_32}
+        Pylon_3_4___GBU_16___1000lb_Laser_Guided_Bomb = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___GBU_16___1000lb_Laser_Guided_Bomb,
+        )
+        Pylon_4___GBU_16___1000lb_Laser_Guided_Bomb = (
+            3,
+            WeaponsFA18EFG.Pylon_4___GBU_16___1000lb_Laser_Guided_Bomb,
+        )
+        Pylon_4___GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb = (
+            3,
+            WeaponsFA18EFG.Pylon_4___GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb,
+        )
+        Pylon_4___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb = (
+            3,
+            WeaponsFA18EFG.Pylon_4___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb,
+        )
+        Pylon_4___GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb = (
+            3,
+            WeaponsFA18EFG.Pylon_4___GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb,
+        )
+        Pylon_3_4___GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = (
+            3,
+            WeaponsFA18EFG.Pylon_3_4___GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb,
+        )
+        Pylon_4___GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = (
+            3,
+            WeaponsFA18EFG.Pylon_4___GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb,
+        )
+        Pylon_4___AGM_84A_Harpoon_AShM = (
+            3,
+            WeaponsFA18EFG.Pylon_4___AGM_84A_Harpoon_AShM,
+        )
+        Pylon_4___AGM_84D_Harpoon_AShM = (
+            3,
+            WeaponsFA18EFG.Pylon_4___AGM_84D_Harpoon_AShM,
+        )
+        Pylon_4___AGM_84E_Harpoon_SLAM = (
+            3,
+            WeaponsFA18EFG.Pylon_4___AGM_84E_Harpoon_SLAM,
+        )
+
+    # ERRR {Left_Inboard_1X_AGM-84H}
 
     class Pylon4:
         AIM_120B_AMRAAM___Active_Radar_AAM = (
@@ -1689,342 +2081,47 @@ class FA_18F(PlaneType):
             Weapons.AN_ASQ_228_ATFLIR___Targeting_Pod,
         )
 
+    # ERRR <CLEAN>
+
     class Pylon5:
-        LAU_115C_with_AIM_7M_Sparrow_Semi_Active_Radar = (
-            5,
-            Weapons.LAU_115C_with_AIM_7M_Sparrow_Semi_Active_Radar,
-        )
-        LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar = (
-            5,
-            Weapons.LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar,
-        )
-        LAU_115C_with_AIM_7MH_Sparrow_Semi_Active_Radar = (
-            5,
-            Weapons.LAU_115C_with_AIM_7MH_Sparrow_Semi_Active_Radar,
-        )
+        AA42R_Buddy_Pod = (5, WeaponsFA18EFG.AA42R_Buddy_Pod)
         FPU_12_Fuel_Tank_480_gallons = (5, WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons)
         FPU_12_Fuel_Tank_480_gallons_High_Vis = (
             5,
             WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_High_Vis,
         )
-        LAU_115_with_1_x_LAU_127_AIM_120B_AMRAAM___Active_Radar_AAM = (
-            5,
-            Weapons.LAU_115_with_1_x_LAU_127_AIM_120B_AMRAAM___Active_Radar_AAM,
-        )
-        LAU_115_with_1_x_LAU_127_AIM_120C_AMRAAM___Active_Radar_AAM = (
-            5,
-            Weapons.LAU_115_with_1_x_LAU_127_AIM_120C_AMRAAM___Active_Radar_AAM,
-        )
-        LAU_115_2_LAU_127_AIM_120B = (5, Weapons.LAU_115_2_LAU_127_AIM_120B)
-        LAU_115_2_LAU_127_AIM_120C = (5, Weapons.LAU_115_2_LAU_127_AIM_120C)
-        LAU_117_with_AGM_65E___Maverick_E__Laser_ASM___Lg_Whd_ = (
-            5,
-            Weapons.LAU_117_with_AGM_65E___Maverick_E__Laser_ASM___Lg_Whd_,
-        )
-        LAU_117_CATM_65K = (5, Weapons.LAU_117_CATM_65K)
-        LAU_117_AGM_65F = (5, Weapons.LAU_117_AGM_65F)
-        AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_ = (
-            5,
-            Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_,
-        )
-        Mk_82___500lb_GP_Bomb_LD = (5, Weapons.Mk_82___500lb_GP_Bomb_LD)
-        Mk_82_Snakeye___500lb_GP_Bomb_HD = (
-            5,
-            Weapons.Mk_82_Snakeye___500lb_GP_Bomb_HD,
-        )
-        Mk_82Y___500lb_GP_Chute_Retarded_HD = (
-            5,
-            Weapons.Mk_82Y___500lb_GP_Chute_Retarded_HD,
-        )
-        Mk_83___1000lb_GP_Bomb_LD = (5, Weapons.Mk_83___1000lb_GP_Bomb_LD)
-        Mk_84___2000lb_GP_Bomb_LD = (5, Weapons.Mk_84___2000lb_GP_Bomb_LD)
-        AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_ = (
-            5,
-            Weapons.AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_,
-        )
-        AGM_84H_SLAM_ER__Expanded_Response_ = (
-            5,
-            Weapons.AGM_84H_SLAM_ER__Expanded_Response_,
-        )
-        BRU_33_with_2_x_Mk_82___500lb_GP_Bomb_LD = (
-            5,
-            Weapons.BRU_33_with_2_x_Mk_82___500lb_GP_Bomb_LD,
-        )
-        BRU_33_with_2_x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
-            5,
-            Weapons.BRU_33_with_2_x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
-        )
-        BRU_33_with_2_x_Mk_82Y___500lb_GP_Chute_Retarded_HD = (
-            5,
-            Weapons.BRU_33_with_2_x_Mk_82Y___500lb_GP_Chute_Retarded_HD,
-        )
-        BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
-            5,
-            Weapons.BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
-        )
-        BRU_33_with_2_x_Mk_83___1000lb_GP_Bomb_LD = (
-            5,
-            Weapons.BRU_33_with_2_x_Mk_83___1000lb_GP_Bomb_LD,
-        )
-        BRU_41A_with_6_x_BDU_33___25lb_Practice_Bomb_LD = (
-            5,
-            Weapons.BRU_41A_with_6_x_BDU_33___25lb_Practice_Bomb_LD,
-        )
-        GBU_10___2000lb_Laser_Guided_Bomb = (
-            5,
-            Weapons.GBU_10___2000lb_Laser_Guided_Bomb,
-        )
-        GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = (
-            5,
-            Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb,
-        )
-        GBU_12___500lb_Laser_Guided_Bomb = (
-            5,
-            Weapons.GBU_12___500lb_Laser_Guided_Bomb,
-        )
-        GBU_16___1000lb_Laser_Guided_Bomb = (
-            5,
-            Weapons.GBU_16___1000lb_Laser_Guided_Bomb,
-        )
-        CBU_99___490lbs__247_x_HEAT_Bomblets = (
-            5,
-            Weapons.CBU_99___490lbs__247_x_HEAT_Bomblets,
-        )
-        Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
-            5,
-            Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
-        )
-        BRU_33_with_2_x_CBU_99___490lbs__247_x_HEAT_Bomblets = (
-            5,
-            Weapons.BRU_33_with_2_x_CBU_99___490lbs__247_x_HEAT_Bomblets,
-        )
-        BRU_33_with_2_x_GBU_12___500lb_Laser_Guided_Bomb = (
-            5,
-            Weapons.BRU_33_with_2_x_GBU_12___500lb_Laser_Guided_Bomb,
-        )
-        # ERRR <CLEAN>
-        AGM_154A___JSOW_CEB__CBU_type_ = (
-            5,
-            Weapons.AGM_154A___JSOW_CEB__CBU_type_,
-        )
-        BRU_55_with_2_x_AGM_154A___JSOW_CEB__CBU_type_ = (
-            5,
-            Weapons.BRU_55_with_2_x_AGM_154A___JSOW_CEB__CBU_type_,
-        )
-        AGM_154C___JSOW_Unitary_BROACH = (
-            5,
-            Weapons.AGM_154C___JSOW_Unitary_BROACH,
-        )
-        BRU_55_with_2_x_AGM_154C___JSOW_Unitary_BROACH = (
-            5,
-            Weapons.BRU_55_with_2_x_AGM_154C___JSOW_Unitary_BROACH,
-        )
-        GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb = (
-            5,
-            Weapons.GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb,
-        )
-        GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb = (
-            5,
-            Weapons.GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb,
-        )
-        GBU_32_V_2_B___JDAM__1000lb_GPS_Guided_Bomb = (
-            5,
-            Weapons.GBU_32_V_2_B___JDAM__1000lb_GPS_Guided_Bomb,
-        )
-        GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb = (
-            5,
-            Weapons.GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb,
-        )
-        BRU_55_with_2_x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
-            5,
-            Weapons.BRU_55_with_2_x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
-        )
-        AGM_84D_Harpoon_AShM = (5, Weapons.AGM_84D_Harpoon_AShM)
         AWW_13_DATALINK_POD = (5, Weapons.AWW_13_DATALINK_POD)
-        GBU_54_V_1_B___LJDAM__500lb_Laser__GPS_Guided_Bomb_LD = (
-            5,
-            Weapons.GBU_54_V_1_B___LJDAM__500lb_Laser__GPS_Guided_Bomb_LD,
-        )
+        USAFlag_ = (5, WeaponsFA18EFG.USAFlag_)
+        Smoke_Generator___red_ = (5, Weapons.Smoke_Generator___red_)
+        Smoke_Generator___green_ = (5, Weapons.Smoke_Generator___green_)
+        Smoke_Generator___blue_ = (5, Weapons.Smoke_Generator___blue_)
+        Smoke_Generator___white_ = (5, Weapons.Smoke_Generator___white_)
+        Smoke_Generator___yellow_ = (5, Weapons.Smoke_Generator___yellow_)
+        Smoke_Generator___orange_ = (5, Weapons.Smoke_Generator___orange_)
 
     class Pylon6:
-        LAU_115C_with_AIM_7M_Sparrow_Semi_Active_Radar = (
+        AIM_120B_AMRAAM___Active_Radar_AAM = (
             6,
-            Weapons.LAU_115C_with_AIM_7M_Sparrow_Semi_Active_Radar,
+            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
         )
-        LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar = (
+        AIM_120C_AMRAAM___Active_Radar_AAM = (
             6,
-            Weapons.LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar,
-        )
-        LAU_115C_with_AIM_7MH_Sparrow_Semi_Active_Radar = (
-            6,
-            Weapons.LAU_115C_with_AIM_7MH_Sparrow_Semi_Active_Radar,
+            Weapons.AIM_120C_AMRAAM___Active_Radar_AAM,
         )
+        AWW_13_DATALINK_POD = (6, Weapons.AWW_13_DATALINK_POD)
         FPU_12_Fuel_Tank_480_gallons = (6, WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons)
         FPU_12_Fuel_Tank_480_gallons_High_Vis = (
             6,
             WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_High_Vis,
         )
-        LAU_115_with_1_x_LAU_127_AIM_120B_AMRAAM___Active_Radar_AAM = (
-            6,
-            Weapons.LAU_115_with_1_x_LAU_127_AIM_120B_AMRAAM___Active_Radar_AAM,
-        )
-        LAU_115_with_1_x_LAU_127_AIM_120C_AMRAAM___Active_Radar_AAM = (
-            6,
-            Weapons.LAU_115_with_1_x_LAU_127_AIM_120C_AMRAAM___Active_Radar_AAM,
-        )
-        LAU_115_2_LAU_127_AIM_120B = (6, Weapons.LAU_115_2_LAU_127_AIM_120B)
-        LAU_115_2_LAU_127_AIM_120C = (6, Weapons.LAU_115_2_LAU_127_AIM_120C)
-        LAU_117_with_AGM_65E___Maverick_E__Laser_ASM___Lg_Whd_ = (
-            6,
-            Weapons.LAU_117_with_AGM_65E___Maverick_E__Laser_ASM___Lg_Whd_,
-        )
-        LAU_117_CATM_65K = (6, Weapons.LAU_117_CATM_65K)
-        LAU_117_AGM_65F = (6, Weapons.LAU_117_AGM_65F)
-        AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_ = (
-            6,
-            Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_,
-        )
-        Mk_82___500lb_GP_Bomb_LD = (6, Weapons.Mk_82___500lb_GP_Bomb_LD)
-        Mk_82_Snakeye___500lb_GP_Bomb_HD = (
-            6,
-            Weapons.Mk_82_Snakeye___500lb_GP_Bomb_HD,
-        )
-        Mk_82Y___500lb_GP_Chute_Retarded_HD = (
-            6,
-            Weapons.Mk_82Y___500lb_GP_Chute_Retarded_HD,
-        )
-        Mk_83___1000lb_GP_Bomb_LD = (6, Weapons.Mk_83___1000lb_GP_Bomb_LD)
-        Mk_84___2000lb_GP_Bomb_LD = (6, Weapons.Mk_84___2000lb_GP_Bomb_LD)
-        BDU_45___500lb_Practice_Bomb = (6, Weapons.BDU_45___500lb_Practice_Bomb)
-        BDU_45B___500lb_Practice_Bomb = (
-            6,
-            Weapons.BDU_45B___500lb_Practice_Bomb,
-        )
-        AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_ = (
-            6,
-            Weapons.AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_,
-        )
-        AGM_84H_SLAM_ER__Expanded_Response_ = (
-            6,
-            Weapons.AGM_84H_SLAM_ER__Expanded_Response_,
-        )
-        BRU_33_with_2_x_Mk_82___500lb_GP_Bomb_LD = (
-            6,
-            Weapons.BRU_33_with_2_x_Mk_82___500lb_GP_Bomb_LD,
-        )
-        BRU_33_with_2_x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
-            6,
-            Weapons.BRU_33_with_2_x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
-        )
-        BRU_33_with_2_x_Mk_82Y___500lb_GP_Chute_Retarded_HD = (
-            6,
-            Weapons.BRU_33_with_2_x_Mk_82Y___500lb_GP_Chute_Retarded_HD,
-        )
-        BRU_33_with_2_x_BDU_45___500lb_Practice_Bomb = (
-            6,
-            Weapons.BRU_33_with_2_x_BDU_45___500lb_Practice_Bomb,
-        )
-        BRU_33_with_2_x_BDU_45B___500lb_Practice_Bomb = (
-            6,
-            Weapons.BRU_33_with_2_x_BDU_45B___500lb_Practice_Bomb,
-        )
-        BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
-            6,
-            Weapons.BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
-        )
-        BRU_33_with_2_x_Mk_83___1000lb_GP_Bomb_LD = (
-            6,
-            Weapons.BRU_33_with_2_x_Mk_83___1000lb_GP_Bomb_LD,
-        )
-        BRU_41A_with_6_x_BDU_33___25lb_Practice_Bomb_LD = (
-            6,
-            Weapons.BRU_41A_with_6_x_BDU_33___25lb_Practice_Bomb_LD,
-        )
-        GBU_10___2000lb_Laser_Guided_Bomb = (
-            6,
-            Weapons.GBU_10___2000lb_Laser_Guided_Bomb,
-        )
-        GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = (
-            6,
-            Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb,
-        )
-        GBU_12___500lb_Laser_Guided_Bomb = (
-            6,
-            Weapons.GBU_12___500lb_Laser_Guided_Bomb,
-        )
-        GBU_16___1000lb_Laser_Guided_Bomb = (
-            6,
-            Weapons.GBU_16___1000lb_Laser_Guided_Bomb,
-        )
-        CBU_99___490lbs__247_x_HEAT_Bomblets = (
-            6,
-            Weapons.CBU_99___490lbs__247_x_HEAT_Bomblets,
-        )
-        Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
-            6,
-            Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
-        )
-        BRU_33_with_2_x_CBU_99___490lbs__247_x_HEAT_Bomblets = (
-            6,
-            Weapons.BRU_33_with_2_x_CBU_99___490lbs__247_x_HEAT_Bomblets,
-        )
-        BRU_33_with_2_x_GBU_12___500lb_Laser_Guided_Bomb = (
-            6,
-            Weapons.BRU_33_with_2_x_GBU_12___500lb_Laser_Guided_Bomb,
-        )
-        # ERRR <CLEAN>
-        AGM_154A___JSOW_CEB__CBU_type_ = (
-            6,
-            Weapons.AGM_154A___JSOW_CEB__CBU_type_,
-        )
-        BRU_55_with_2_x_AGM_154A___JSOW_CEB__CBU_type_ = (
-            6,
-            Weapons.BRU_55_with_2_x_AGM_154A___JSOW_CEB__CBU_type_,
-        )
-        AGM_154C___JSOW_Unitary_BROACH = (
-            6,
-            Weapons.AGM_154C___JSOW_Unitary_BROACH,
-        )
-        BRU_55_with_2_x_AGM_154C___JSOW_Unitary_BROACH = (
-            6,
-            Weapons.BRU_55_with_2_x_AGM_154C___JSOW_Unitary_BROACH,
-        )
-        GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb = (
-            6,
-            Weapons.GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb,
-        )
-        GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb = (
-            6,
-            Weapons.GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb,
-        )
-        GBU_32_V_2_B___JDAM__1000lb_GPS_Guided_Bomb = (
-            6,
-            Weapons.GBU_32_V_2_B___JDAM__1000lb_GPS_Guided_Bomb,
-        )
-        GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb = (
-            6,
-            Weapons.GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb,
-        )
-        BRU_55_with_2_x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
-            6,
-            Weapons.BRU_55_with_2_x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
-        )
-        AGM_84D_Harpoon_AShM = (6, Weapons.AGM_84D_Harpoon_AShM)
-        AWW_13_DATALINK_POD = (6, Weapons.AWW_13_DATALINK_POD)
-        GBU_54_V_1_B___LJDAM__500lb_Laser__GPS_Guided_Bomb_LD = (
-            6,
-            Weapons.GBU_54_V_1_B___LJDAM__500lb_Laser__GPS_Guided_Bomb_LD,
-        )
+
+    # ERRR <CLEAN>
 
     class Pylon7:
-        LAU_115_2_LAU_127_AIM_9M = (7, Weapons.LAU_115_2_LAU_127_AIM_9M)
-        LAU_115_2_LAU_127_CATM_9M = (7, Weapons.LAU_115_2_LAU_127_CATM_9M)
-        LAU_115_2_LAU_127_AIM_9L = (7, Weapons.LAU_115_2_LAU_127_AIM_9L)
-        LAU_115_2_LAU_127_AIM_9X = (7, Weapons.LAU_115_2_LAU_127_AIM_9X)
-        LAU_115_LAU_127_AIM_9X = (7, Weapons.LAU_115_LAU_127_AIM_9X)
-        LAU_115_LAU_127_CATM_9M = (7, Weapons.LAU_115_LAU_127_CATM_9M)
-        LAU_115_LAU_127_AIM_9L = (7, Weapons.LAU_115_LAU_127_AIM_9L)
-        LAU_115_LAU_127_AIM_9M = (7, Weapons.LAU_115_LAU_127_AIM_9M)
+        ALQ_167 = (7, WeaponsFA18EFG.ALQ_167)
+        LAU_115_2_LAU_127_AIM_120B = (7, Weapons.LAU_115_2_LAU_127_AIM_120B)
+        LAU_115_2_LAU_127_AIM_120C = (7, Weapons.LAU_115_2_LAU_127_AIM_120C)
+        # ERRR LAU-115_2*LAU-127_CATM-120C
         LAU_115C_with_AIM_7M_Sparrow_Semi_Active_Radar = (
             7,
             Weapons.LAU_115C_with_AIM_7M_Sparrow_Semi_Active_Radar,
@@ -2046,17 +2143,6 @@ class FA_18F(PlaneType):
             7,
             WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_High_Vis,
         )
-        AIM_120B_AMRAAM___Active_Radar_AAM = (
-            7,
-            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
-        )
-        AIM_120C_AMRAAM___Active_Radar_AAM = (
-            7,
-            Weapons.AIM_120C_AMRAAM___Active_Radar_AAM,
-        )
-        LAU_115_2_LAU_127_AIM_120B = (7, Weapons.LAU_115_2_LAU_127_AIM_120B)
-        LAU_115_2_LAU_127_AIM_120C = (7, Weapons.LAU_115_2_LAU_127_AIM_120C)
-        # ERRR LAU-115_2*LAU-127_CATM-120C
         # ERRR LAU_117_TGM_65E
         # ERRR LAU_117_TGM_65F
         LAU_117_with_AGM_65E___Maverick_E__Laser_ASM___Lg_Whd_ = (
@@ -2067,51 +2153,35 @@ class FA_18F(PlaneType):
         LAU_117_AGM_65F = (7, Weapons.LAU_117_AGM_65F)
         AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_ = (
             7,
-            Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_,
+            WeaponsFA18EFG.Pylon_8___Mk_82___500lb_GP_Bomb_LD,
         )
-        Mk_82___500lb_GP_Bomb_LD = (7, Weapons.Mk_82___500lb_GP_Bomb_LD)
-        Mk_82_Snakeye___500lb_GP_Bomb_HD = (
-            7,
-            Weapons.Mk_82_Snakeye___500lb_GP_Bomb_HD,
-        )
-        Mk_82Y___500lb_GP_Chute_Retarded_HD = (
+        Pylon_8___Mk_82Y___500lb_GP_Bomb_Chute_Retarded_HD = (
             7,
             Weapons.Mk_82Y___500lb_GP_Chute_Retarded_HD,
         )
-        Mk_83___1000lb_GP_Bomb_LD = (7, Weapons.Mk_83___1000lb_GP_Bomb_LD)
-        Mk_84___2000lb_GP_Bomb_LD = (7, Weapons.Mk_84___2000lb_GP_Bomb_LD)
-        BDU_45___500lb_Practice_Bomb = (7, Weapons.BDU_45___500lb_Practice_Bomb)
-        BDU_45B___500lb_Practice_Bomb = (
+        Pylon_8___Mk_82_Snakeye___500lb_GP_Bomb_HD = (
             7,
-            Weapons.BDU_45B___500lb_Practice_Bomb,
-        )
-        AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_ = (
-            7,
-            Weapons.AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_,
-        )
-        AGM_84H_SLAM_ER__Expanded_Response_ = (
-            7,
-            Weapons.AGM_84H_SLAM_ER__Expanded_Response_,
+            WeaponsFA18EFG.Pylon_8___Mk_82_Snakeye___500lb_GP_Bomb_HD,
         )
         BRU_33_with_2_x_Mk_82___500lb_GP_Bomb_LD = (
             7,
-            Weapons.BRU_33_with_2_x_Mk_82___500lb_GP_Bomb_LD,
+            WeaponsFA18EFG.Pylon_8___Mk_83___1000lb_GP_Bomb_LD,
         )
-        BRU_33_with_2_x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+        Pylon_8___Mk_84___2000lb_GP_Bomb_LD = (
             7,
-            Weapons.BRU_33_with_2_x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
+            WeaponsFA18EFG.Pylon_8___Mk_84___2000lb_GP_Bomb_LD,
         )
-        BRU_33_with_2_x_Mk_82Y___500lb_GP_Chute_Retarded_HD = (
+        Pylon_8___Mk_20_Rockeye___490lb_CBU__247_x_HEAT_Bomblets = (
             7,
-            Weapons.BRU_33_with_2_x_Mk_82Y___500lb_GP_Chute_Retarded_HD,
+            WeaponsFA18EFG.Pylon_8___Mk_20_Rockeye___490lb_CBU__247_x_HEAT_Bomblets,
         )
-        BRU_33_with_2_x_BDU_45___500lb_Practice_Bomb = (
+        Pylon_9_8___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb = (
             7,
-            Weapons.BRU_33_with_2_x_BDU_45___500lb_Practice_Bomb,
+            WeaponsFA18EFG.Pylon_9_8___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb,
         )
-        BRU_33_with_2_x_BDU_45B___500lb_Practice_Bomb = (
+        Pylon_9_8___GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb = (
             7,
-            Weapons.BRU_33_with_2_x_BDU_45B___500lb_Practice_Bomb,
+            WeaponsFA18EFG.Pylon_9_8___GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb,
         )
         BRU_33_with_2_x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             7,
@@ -2129,11 +2199,12 @@ class FA_18F(PlaneType):
             7,
             Weapons.GBU_10___2000lb_Laser_Guided_Bomb,
         )
-        GBU_12___500lb_Laser_Guided_Bomb = (
+
+        BRU_41A_with_6_x_BDU_33___25lb_Practice_Bomb_LD = (
             7,
-            Weapons.GBU_12___500lb_Laser_Guided_Bomb,
+            Weapons.BRU_41A_with_6_x_BDU_33___25lb_Practice_Bomb_LD,
         )
-        GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = (
+        Pylon_9_8___GBU_12___500lb_Laser_Guided_Bomb = (
             7,
             Weapons.GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb,
         )
@@ -2141,40 +2212,19 @@ class FA_18F(PlaneType):
             7,
             Weapons.GBU_16___1000lb_Laser_Guided_Bomb,
         )
-        CBU_99___490lbs__247_x_HEAT_Bomblets = (
-            7,
-            Weapons.CBU_99___490lbs__247_x_HEAT_Bomblets,
-        )
         Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             7,
             Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
-        BRU_33_with_2_x_CBU_99___490lbs__247_x_HEAT_Bomblets = (
-            7,
-            Weapons.BRU_33_with_2_x_CBU_99___490lbs__247_x_HEAT_Bomblets,
-        )
         BRU_33_with_2_x_GBU_12___500lb_Laser_Guided_Bomb = (
             7,
             Weapons.BRU_33_with_2_x_GBU_12___500lb_Laser_Guided_Bomb,
         )
-        # ERRR <CLEAN>
-        AGM_154A___JSOW_CEB__CBU_type_ = (
+        Pylon_8___GBU_12___500lb_Laser_Guided_Bomb = (
             7,
-            Weapons.AGM_154A___JSOW_CEB__CBU_type_,
+            WeaponsFA18EFG.Pylon_8___GBU_12___500lb_Laser_Guided_Bomb,
         )
-        BRU_55_with_2_x_AGM_154A___JSOW_CEB__CBU_type_ = (
-            7,
-            Weapons.BRU_55_with_2_x_AGM_154A___JSOW_CEB__CBU_type_,
-        )
-        AGM_154C___JSOW_Unitary_BROACH = (
-            7,
-            Weapons.AGM_154C___JSOW_Unitary_BROACH,
-        )
-        BRU_55_with_2_x_AGM_154C___JSOW_Unitary_BROACH = (
-            7,
-            Weapons.BRU_55_with_2_x_AGM_154C___JSOW_Unitary_BROACH,
-        )
-        GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb = (
+        Pylon_8___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb = (
             7,
             Weapons.GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb,
         )
@@ -2198,17 +2248,10 @@ class FA_18F(PlaneType):
         AWW_13_DATALINK_POD = (7, Weapons.AWW_13_DATALINK_POD)
         GBU_54_V_1_B___LJDAM__500lb_Laser__GPS_Guided_Bomb_LD = (
             7,
-            Weapons.GBU_54_V_1_B___LJDAM__500lb_Laser__GPS_Guided_Bomb_LD,
+            WeaponsFA18EFG.Pylon_8___AGM_84E_Harpoon_SLAM,
         )
-        BRU_42_with_3_x_ADM_141A_TALD = (
-            7,
-            Weapons.BRU_42_with_3_x_ADM_141A_TALD,
-        )
-        BRU_42_with_2_x_ADM_141A_TALD = (
-            7,
-            Weapons.BRU_42_with_2_x_ADM_141A_TALD,
-        )
-        BRU_42_with_ADM_141A_TALD = (7, Weapons.BRU_42_with_ADM_141A_TALD)
+
+    # ERRR {Right_Inboard_1X_AGM-84H}
 
     class Pylon8:
         TLAU_127 = (8, WeaponsFA18EFG.TLAU_127)
@@ -2216,27 +2259,101 @@ class FA_18F(PlaneType):
             8,
             Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
         )
-        AIM_120C_AMRAAM___Active_Radar_AAM = (
-            8,
-            Weapons.AIM_120C_AMRAAM___Active_Radar_AAM,
+        Pylon_8___Mk_83___1000lb_GP_Bomb_LD = (
+            7,
+            WeaponsFA18EFG.Pylon_8___Mk_83___1000lb_GP_Bomb_LD,
         )
-        # ERRR {CATM-120C}
-        LAU_115C_with_AIM_7M_Sparrow_Semi_Active_Radar = (
-            8,
-            Weapons.LAU_115C_with_AIM_7M_Sparrow_Semi_Active_Radar,
+        Pylon_8___Mk_84___2000lb_GP_Bomb_LD = (
+            7,
+            WeaponsFA18EFG.Pylon_8___Mk_84___2000lb_GP_Bomb_LD,
         )
-        LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar = (
-            8,
-            Weapons.LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar,
+        Pylon_8___Mk_20_Rockeye___490lb_CBU__247_x_HEAT_Bomblets = (
+            7,
+            WeaponsFA18EFG.Pylon_8___Mk_20_Rockeye___490lb_CBU__247_x_HEAT_Bomblets,
         )
-        LAU_115C_with_AIM_7MH_Sparrow_Semi_Active_Radar = (
-            8,
-            Weapons.LAU_115C_with_AIM_7MH_Sparrow_Semi_Active_Radar,
+        Pylon_9_8___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb = (
+            7,
+            WeaponsFA18EFG.Pylon_9_8___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb,
         )
-        LAU_115C_with_AIM_7P_Sparrow_Semi_Active_Radar = (
-            8,
-            Weapons.LAU_115C_with_AIM_7P_Sparrow_Semi_Active_Radar,
+        Pylon_9_8___GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb = (
+            7,
+            WeaponsFA18EFG.Pylon_9_8___GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb,
         )
+        Pylon_9_8___AGM_154A___JSOW_CEB__CBU_type_ = (
+            7,
+            WeaponsFA18EFG.Pylon_9_8___AGM_154A___JSOW_CEB__CBU_type_,
+        )
+        Pylon_8___AGM_154A___JSOW_CEB__CBU_type_ = (
+            7,
+            WeaponsFA18EFG.Pylon_8___AGM_154A___JSOW_CEB__CBU_type_,
+        )
+        Pylon_9_8___AGM_154C___JSOW_Unitary_BROACH = (
+            7,
+            WeaponsFA18EFG.Pylon_9_8___AGM_154C___JSOW_Unitary_BROACH,
+        )
+        Pylon_8___AGM_154C___JSOW_Unitary_BROACH = (
+            7,
+            WeaponsFA18EFG.Pylon_8___AGM_154C___JSOW_Unitary_BROACH,
+        )
+        Pylon_9_8___GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb = (
+            7,
+            WeaponsFA18EFG.Pylon_9_8___GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb,
+        )
+        Pylon_9_8___GBU_12___500lb_Laser_Guided_Bomb = (
+            7,
+            WeaponsFA18EFG.Pylon_9_8___GBU_12___500lb_Laser_Guided_Bomb,
+        )
+        Pylon_8___GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb = (
+            7,
+            WeaponsFA18EFG.Pylon_8___GBU_38_V_1_B___JDAM__500lb_GPS_Guided_Bomb,
+        )
+        # ERRR {Right_Midboard_Inboard_2X_GBU_32}
+        # ERRR {Right_Midboard_Inboard_1X_GBU_32}
+        Pylon_9_8___GBU_16___1000lb_Laser_Guided_Bomb = (
+            7,
+            WeaponsFA18EFG.Pylon_9_8___GBU_16___1000lb_Laser_Guided_Bomb,
+        )
+        Pylon_8___GBU_16___1000lb_Laser_Guided_Bomb = (
+            7,
+            WeaponsFA18EFG.Pylon_8___GBU_16___1000lb_Laser_Guided_Bomb,
+        )
+        Pylon_8___GBU_12___500lb_Laser_Guided_Bomb = (
+            7,
+            WeaponsFA18EFG.Pylon_8___GBU_12___500lb_Laser_Guided_Bomb,
+        )
+        Pylon_8___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb = (
+            7,
+            WeaponsFA18EFG.Pylon_8___GBU_31_V_2_B___JDAM__2000lb_GPS_Guided_Bomb,
+        )
+        Pylon_8___GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb = (
+            7,
+            WeaponsFA18EFG.Pylon_8___GBU_31_V_4_B___JDAM__2000lb_GPS_Guided_Penetrator_Bomb,
+        )
+        Pylon_9_8___GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = (
+            7,
+            WeaponsFA18EFG.Pylon_9_8___GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb,
+        )
+        Pylon_8___GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = (
+            7,
+            WeaponsFA18EFG.Pylon_8___GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb,
+        )
+        Pylon_8___AGM_84A_Harpoon_AShM = (
+            7,
+            WeaponsFA18EFG.Pylon_8___AGM_84A_Harpoon_AShM,
+        )
+        Pylon_8___AGM_84D_Harpoon_AShM = (
+            7,
+            WeaponsFA18EFG.Pylon_8___AGM_84D_Harpoon_AShM,
+        )
+        Pylon_8___AGM_84E_Harpoon_SLAM = (
+            7,
+            WeaponsFA18EFG.Pylon_8___AGM_84E_Harpoon_SLAM,
+        )
+
+    # ERRR {Right_Inboard_1X_AGM-84H}
+
+    class Pylon8:
+        TLAU_127 = (8, WeaponsFA18EFG.TLAU_127)
         # ERRR LAU_117_TGM_65E
         # ERRR LAU_117_TGM_65F
         LAU_117_with_AGM_65E___Maverick_E__Laser_ASM___Lg_Whd_ = (
@@ -2292,11 +2409,53 @@ class FA_18F(PlaneType):
             8,
             Weapons.GBU_54_V_1_B___LJDAM__500lb_Laser__GPS_Guided_Bomb_LD,
         )
-        BRU_42_with_2_x_ADM_141A_TALD = (
-            8,
-            Weapons.BRU_42_with_2_x_ADM_141A_TALD,
-        )
+        AGM_154A___JSOW_CEB__CBU_type_ = (8, Weapons.AGM_154A___JSOW_CEB__CBU_type_)
+        AGM_154C___JSOW_Unitary_BROACH = (8, Weapons.AGM_154C___JSOW_Unitary_BROACH)
+        BRU_42_with_2_x_ADM_141A_TALD = (8, Weapons.BRU_42_with_2_x_ADM_141A_TALD)
         BRU_42_with_ADM_141A_TALD = (8, Weapons.BRU_42_with_ADM_141A_TALD)
+        AN_ASQ_T50_TCTS_Pod___ACMI_Pod = (8, Weapons.AN_ASQ_T50_TCTS_Pod___ACMI_Pod)
+        AIM_120B_AMRAAM___Active_Radar_AAM = (
+            8,
+            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
+        )
+        AIM_120C_AMRAAM___Active_Radar_AAM = (
+            8,
+            Weapons.AIM_120C_AMRAAM___Active_Radar_AAM,
+        )
+        AIM_9X_Sidewinder_IR_AAM = (8, Weapons.AIM_9X_Sidewinder_IR_AAM)
+        # ERRR {CATM-120C}
+        Pylon_10_8___GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
+            8,
+            WeaponsFA18EFG.Pylon_10_8___GBU_38___JDAM__500lb_GPS_Guided_Bomb,
+        )
+        Pylon_10_8___Mk_82___500lb_GP_Bomb_LD = (
+            8,
+            WeaponsFA18EFG.Pylon_10_8___Mk_82___500lb_GP_Bomb_LD,
+        )
+        Pylon_10_8___Mk_82Y___500lb_GP_Chute_Retarded_HD = (
+            8,
+            WeaponsFA18EFG.Pylon_10_8___Mk_82Y___500lb_GP_Chute_Retarded_HD,
+        )
+        Pylon_10_8___Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+            8,
+            WeaponsFA18EFG.Pylon_10_8___Mk_82_Snakeye___500lb_GP_Bomb_HD,
+        )
+        Pylon_10_8___Mk_83___1000lb_GP_Bomb_LD = (
+            8,
+            WeaponsFA18EFG.Pylon_10_8___Mk_83___1000lb_GP_Bomb_LD,
+        )
+        Pylon_10_8___GBU_12___500lb_Laser_Guided_Bomb = (
+            8,
+            WeaponsFA18EFG.Pylon_10_8___GBU_12___500lb_Laser_Guided_Bomb,
+        )
+        Pylon_10_8___GBU_16___1000lb_Laser_Guided_Bomb = (
+            8,
+            WeaponsFA18EFG.Pylon_10_8___GBU_16___1000lb_Laser_Guided_Bomb,
+        )
+        Pylon_10_8___Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
+            8,
+            WeaponsFA18EFG.Pylon_10_8___Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
+        )
 
     class Pylon9:
         AIM_9M_Sidewinder_IR_AAM = (9, Weapons.AIM_9M_Sidewinder_IR_AAM)
@@ -2309,22 +2468,14 @@ class FA_18F(PlaneType):
             Weapons.AN_ASQ_T50_TCTS_Pod___ACMI_Pod,
         )
 
-    # ERRR <CLEAN>
-
     class Pylon10:
-        AA42R_Buddy_Pod = (10, WeaponsFA18EFG.AA42R_Buddy_Pod)
         FPU_12_Fuel_Tank_480_gallons = (10, WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons)
         FPU_12_Fuel_Tank_480_gallons_High_Vis = (
             10,
             WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_High_Vis,
         )
-        USAFlag = (10, WeaponsFA18EFG.USAFlag)
-        Smoke_Generator___red_ = (10, Weapons.Smoke_Generator___red_)
-        Smoke_Generator___green_ = (10, Weapons.Smoke_Generator___green_)
-        Smoke_Generator___blue_ = (10, Weapons.Smoke_Generator___blue_)
-        Smoke_Generator___white_ = (10, Weapons.Smoke_Generator___white_)
-        Smoke_Generator___yellow_ = (10, Weapons.Smoke_Generator___yellow_)
-        Smoke_Generator___orange_ = (10, Weapons.Smoke_Generator___orange_)
+
+    # ERRR <CLEAN>
 
     pylons: Set[int] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}
 
@@ -2540,34 +2691,36 @@ class EA_18G(PlaneType):
     livery_name = "EA-18G"  # from type
 
     class Pylon1:
-        FPU_12_Fuel_Tank_480_gallons = (1, WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons)
-        FPU_12_Fuel_Tank_480_gallons_High_Vis = (
+        FPU_12_Fuel_Tank_480_gallons_ = (
             1,
-            WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_High_Vis,
+            WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_,
+        )
+        FPU_12_Fuel_Tank_480_gallons_High_Vis_ = (
+            1,
+            WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_High_Vis_,
         )
         ALQ_99Wing = (1, WeaponsFA18EFG.ALQ_99Wing)
+        ALQ_249 = (1, WeaponsFA18EFG.ALQ_249)
 
     # ERRR <CLEAN>
 
     class Pylon2:
-        FPU_12_Fuel_Tank_480_gallons = (2, WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons)
-        FPU_12_Fuel_Tank_480_gallons_High_Vis = (
+        FPU_12_Fuel_Tank_480_gallons_ = (
             2,
-            WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_High_Vis,
+            WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_,
+        )
+        FPU_12_Fuel_Tank_480_gallons_High_Vis_ = (
+            2,
+            WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_High_Vis_,
         )
         ALQ_99Wing = (2, WeaponsFA18EFG.ALQ_99Wing)
-        AGM_154A___JSOW_CEB__CBU_type_ = (
-            2,
-            Weapons.AGM_154A___JSOW_CEB__CBU_type_,
-        )
+        ALQ_249 = (2, WeaponsFA18EFG.ALQ_249)
+        AGM_154A___JSOW_CEB__CBU_type_ = (2, Weapons.AGM_154A___JSOW_CEB__CBU_type_)
         BRU_55_with_2_x_AGM_154A___JSOW_CEB__CBU_type_ = (
             2,
             Weapons.BRU_55_with_2_x_AGM_154A___JSOW_CEB__CBU_type_,
         )
-        AGM_154C___JSOW_Unitary_BROACH = (
-            2,
-            Weapons.AGM_154C___JSOW_Unitary_BROACH,
-        )
+        AGM_154C___JSOW_Unitary_BROACH = (2, Weapons.AGM_154C___JSOW_Unitary_BROACH)
         BRU_55_with_2_x_AGM_154C___JSOW_Unitary_BROACH = (
             2,
             Weapons.BRU_55_with_2_x_AGM_154C___JSOW_Unitary_BROACH,
@@ -2580,16 +2733,22 @@ class EA_18G(PlaneType):
     # ERRR <CLEAN>
 
     class Pylon3:
-        AN_ASQ_T50_TCTS_Pod___ACMI_Pod = (
+        AN_ASQ_T50_TCTS_Pod___ACMI_Pod = (3, Weapons.AN_ASQ_T50_TCTS_Pod___ACMI_Pod)
+        AIM_9X_Sidewinder_IR_AAM = (3, Weapons.AIM_9X_Sidewinder_IR_AAM)
+        AIM_120B_AMRAAM___Active_Radar_AAM = (
             3,
-            Weapons.AN_ASQ_T50_TCTS_Pod___ACMI_Pod,
+            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
+        )
+        AIM_120C_AMRAAM___Active_Radar_AAM = (
+            3,
+            Weapons.AIM_120C_AMRAAM___Active_Radar_AAM,
         )
         AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_ = (
             3,
             Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_,
         )
         # ERRR <CLEAN>
-        TLAU_127 = (3, WeaponsFA18EFG.TLAU_127)
+        TLAU_127_ = (3, WeaponsFA18EFG.TLAU_127_)
 
     class Pylon4:
         AIM_120B_AMRAAM___Active_Radar_AAM = (
@@ -2602,10 +2761,13 @@ class EA_18G(PlaneType):
         )
 
     class Pylon5:
-        FPU_12_Fuel_Tank_480_gallons = (5, WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons)
-        FPU_12_Fuel_Tank_480_gallons_High_Vis = (
+        FPU_12_Fuel_Tank_480_gallons_ = (
             5,
-            WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_High_Vis,
+            WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_,
+        )
+        FPU_12_Fuel_Tank_480_gallons_High_Vis_ = (
+            5,
+            WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_High_Vis_,
         )
         ALQ_99Center = (5, WeaponsFA18EFG.ALQ_99Center)
 
@@ -2622,36 +2784,40 @@ class EA_18G(PlaneType):
         )
 
     class Pylon7:
-        AN_ASQ_T50_TCTS_Pod___ACMI_Pod = (
+        AN_ASQ_T50_TCTS_Pod___ACMI_Pod = (7, Weapons.AN_ASQ_T50_TCTS_Pod___ACMI_Pod)
+        AIM_9X_Sidewinder_IR_AAM = (7, Weapons.AIM_9X_Sidewinder_IR_AAM)
+        AIM_120B_AMRAAM___Active_Radar_AAM = (
             7,
-            Weapons.AN_ASQ_T50_TCTS_Pod___ACMI_Pod,
+            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
+        )
+        AIM_120C_AMRAAM___Active_Radar_AAM = (
+            7,
+            Weapons.AIM_120C_AMRAAM___Active_Radar_AAM,
         )
         AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_ = (
             7,
             Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_,
         )
         # ERRR <CLEAN>
-        TLAU_127 = (7, WeaponsFA18EFG.TLAU_127)
+        TLAU_127_ = (7, WeaponsFA18EFG.TLAU_127_)
 
     class Pylon8:
-        FPU_12_Fuel_Tank_480_gallons = (8, WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons)
-        FPU_12_Fuel_Tank_480_gallons_High_Vis = (
+        FPU_12_Fuel_Tank_480_gallons_ = (
             8,
-            WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_High_Vis,
+            WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_,
+        )
+        FPU_12_Fuel_Tank_480_gallons_High_Vis_ = (
+            8,
+            WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_High_Vis_,
         )
         ALQ_99Wing = (8, WeaponsFA18EFG.ALQ_99Wing)
-        AGM_154A___JSOW_CEB__CBU_type_ = (
-            8,
-            Weapons.AGM_154A___JSOW_CEB__CBU_type_,
-        )
+        ALQ_249 = (8, WeaponsFA18EFG.ALQ_249)
+        AGM_154A___JSOW_CEB__CBU_type_ = (8, Weapons.AGM_154A___JSOW_CEB__CBU_type_)
         BRU_55_with_2_x_AGM_154A___JSOW_CEB__CBU_type_ = (
             8,
             Weapons.BRU_55_with_2_x_AGM_154A___JSOW_CEB__CBU_type_,
         )
-        AGM_154C___JSOW_Unitary_BROACH = (
-            8,
-            Weapons.AGM_154C___JSOW_Unitary_BROACH,
-        )
+        AGM_154C___JSOW_Unitary_BROACH = (8, Weapons.AGM_154C___JSOW_Unitary_BROACH)
         BRU_55_with_2_x_AGM_154C___JSOW_Unitary_BROACH = (
             8,
             Weapons.BRU_55_with_2_x_AGM_154C___JSOW_Unitary_BROACH,
@@ -2664,17 +2830,21 @@ class EA_18G(PlaneType):
     # ERRR <CLEAN>
 
     class Pylon9:
-        FPU_12_Fuel_Tank_480_gallons = (9, WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons)
-        FPU_12_Fuel_Tank_480_gallons_High_Vis = (
+        FPU_12_Fuel_Tank_480_gallons_ = (
             9,
-            WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_High_Vis,
+            WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_,
+        )
+        FPU_12_Fuel_Tank_480_gallons_High_Vis_ = (
+            9,
+            WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons_High_Vis_,
         )
         ALQ_99Wing = (9, WeaponsFA18EFG.ALQ_99Wing)
+        ALQ_249 = (9, WeaponsFA18EFG.ALQ_249)
 
     # ERRR <CLEAN>
 
     class Pylon10:
-        USAFlag = (10, WeaponsFA18EFG.USAFlag)
+        USAFlag_ = (10, WeaponsFA18EFG.USAFlag_)
 
     pylons: Set[int] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}
 
@@ -2692,4 +2862,4 @@ class EA_18G(PlaneType):
         task.AntishipStrike,
         task.Reconnaissance,
     ]
-    task_default = task.CAP
+    task_default = task.SEAD
diff --git a/pydcs_extensions/hercules/hercules.py b/pydcs_extensions/hercules/hercules.py
index 3730edfd..c4ee5e05 100644
--- a/pydcs_extensions/hercules/hercules.py
+++ b/pydcs_extensions/hercules/hercules.py
@@ -736,7 +736,7 @@ class Hercules(PlaneType):
     class Pylon2:
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         Smokewinder___red = (2, Weapons.Smokewinder___red)
         Smokewinder___green = (2, Weapons.Smokewinder___green)
@@ -753,7 +753,7 @@ class Hercules(PlaneType):
     class Pylon3:
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         Smokewinder___red = (3, Weapons.Smokewinder___red)
         Smokewinder___green = (3, Weapons.Smokewinder___green)
@@ -770,7 +770,7 @@ class Hercules(PlaneType):
     class Pylon4:
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             4,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         Smokewinder___red = (4, Weapons.Smokewinder___red)
         Smokewinder___green = (4, Weapons.Smokewinder___green)
@@ -787,7 +787,7 @@ class Hercules(PlaneType):
     class Pylon5:
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         Smokewinder___red = (5, Weapons.Smokewinder___red)
         Smokewinder___green = (5, Weapons.Smokewinder___green)
diff --git a/pydcs_extensions/ov10a/ov10a.py b/pydcs_extensions/ov10a/ov10a.py
index 13db9be6..21b96591 100644
--- a/pydcs_extensions/ov10a/ov10a.py
+++ b/pydcs_extensions/ov10a/ov10a.py
@@ -75,67 +75,67 @@ class Bronco_OV_10A(PlaneType):
         M260_HYDRA_WP = (2, Weapons.M260_HYDRA_WP)
         LAU_10R_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             2,
-            Weapons.LAU_10R_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE_,
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             2,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         LAU_61R_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             2,
-            Weapons.LAU_61R_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             2,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             2,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM,
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             2,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
 
     # ERRR {MK-81}
@@ -154,67 +154,67 @@ class Bronco_OV_10A(PlaneType):
         M260_HYDRA_WP = (3, Weapons.M260_HYDRA_WP)
         LAU_10R_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             3,
-            Weapons.LAU_10R_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE_,
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             3,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         LAU_61R_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             3,
-            Weapons.LAU_61R_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             3,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             3,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM,
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             3,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
 
     class Pylon4:
@@ -242,67 +242,67 @@ class Bronco_OV_10A(PlaneType):
         M260_HYDRA_WP = (5, Weapons.M260_HYDRA_WP)
         LAU_10R_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             5,
-            Weapons.LAU_10R_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE_,
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             5,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         LAU_61R_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             5,
-            Weapons.LAU_61R_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             5,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             5,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM,
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             5,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
 
     # ERRR {MK-81}
@@ -321,67 +321,67 @@ class Bronco_OV_10A(PlaneType):
         M260_HYDRA_WP = (6, Weapons.M260_HYDRA_WP)
         LAU_10R_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             6,
-            Weapons.LAU_10R_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE_,
         )
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             6,
-            Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
+            Weapons.LAU_10___4_x_UnGd_Rkts__127_mm_Zuni_Mk__24_Mod__1_HE,
         )
         LAU_61R_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             6,
-            Weapons.LAU_61R_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             6,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             6,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos = (
             6,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_M156_SM,
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE = (
             6,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk1__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT = (
             6,
-            Weapons.LAU_68_pod___7_x_2_75_FFAR__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Mk_4_FFAR_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             6,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos = (
             6,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M156__Wht_Phos,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M156_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum = (
             6,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M257__Para_Illum,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M257_IL,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk = (
             6,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_M274__Practice_Smk,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_M274_TP_SM,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice = (
             6,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk1__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_1_HE,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT = (
             6,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk5__HEAT,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_5_HEAT,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice = (
             6,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_Mk61__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_Mk_61_TP,
         )
         LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice = (
             6,
-            Weapons.LAU_68_pod___7_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice,
+            Weapons.LAU_68___7_x_UnGd_Rkts__70_mm_Hydra_70_WTU_1_B_TP,
         )
 
     class Pylon7:
diff --git a/pydcs_extensions/su15/su15.py b/pydcs_extensions/su15/su15.py
index aa74087f..f772fed3 100644
--- a/pydcs_extensions/su15/su15.py
+++ b/pydcs_extensions/su15/su15.py
@@ -1,4 +1,4 @@
-from typing import Any, Dict, Set
+from typing import Set
 
 from dcs import task
 from dcs.planes import PlaneType
@@ -46,11 +46,11 @@ class Su_15TM(PlaneType):
         R_8M1T = (1, WeaponsSu15.R_8M1T)
         UB_32A_pod___32_x_S_5KO__57mm_UnGd_Rkts__HEAT_Frag = (
             1,
-            Weapons.UB_32A_pod___32_x_S_5KO__57mm_UnGd_Rkts__HEAT_Frag,
+            Weapons.UB_32A___32_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag,
         )
         UB_16UM_pod___16_x_S_5KO__57mm_UnGd_Rkts__HEAT_Frag = (
             1,
-            Weapons.UB_16UM_pod___16_x_S_5KO__57mm_UnGd_Rkts__HEAT_Frag,
+            Weapons.UB_16_57UMP___16_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag,
         )
         S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_ = (
             1,
@@ -78,11 +78,11 @@ class Su_15TM(PlaneType):
         PTB_600 = (3, WeaponsSu15.PTB_600)
         UB_32A_pod___32_x_S_5KO__57mm_UnGd_Rkts__HEAT_Frag = (
             3,
-            Weapons.UB_32A_pod___32_x_S_5KO__57mm_UnGd_Rkts__HEAT_Frag,
+            Weapons.UB_32A___32_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag,
         )
         UB_16UM_pod___16_x_S_5KO__57mm_UnGd_Rkts__HEAT_Frag = (
             3,
-            Weapons.UB_16UM_pod___16_x_S_5KO__57mm_UnGd_Rkts__HEAT_Frag,
+            Weapons.UB_16_57UMP___16_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag,
         )
         S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_ = (
             3,
@@ -100,11 +100,11 @@ class Su_15TM(PlaneType):
         PTB_600 = (4, WeaponsSu15.PTB_600)
         UB_32A_pod___32_x_S_5KO__57mm_UnGd_Rkts__HEAT_Frag = (
             4,
-            Weapons.UB_32A_pod___32_x_S_5KO__57mm_UnGd_Rkts__HEAT_Frag,
+            Weapons.UB_32A___32_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag,
         )
         UB_16UM_pod___16_x_S_5KO__57mm_UnGd_Rkts__HEAT_Frag = (
             4,
-            Weapons.UB_16UM_pod___16_x_S_5KO__57mm_UnGd_Rkts__HEAT_Frag,
+            Weapons.UB_16_57UMP___16_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag,
         )
         S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_ = (
             4,
@@ -131,11 +131,11 @@ class Su_15TM(PlaneType):
         R_8M1T = (6, WeaponsSu15.R_8M1T)
         UB_32A_pod___32_x_S_5KO__57mm_UnGd_Rkts__HEAT_Frag = (
             6,
-            Weapons.UB_32A_pod___32_x_S_5KO__57mm_UnGd_Rkts__HEAT_Frag,
+            Weapons.UB_32A___32_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag,
         )
         UB_16UM_pod___16_x_S_5KO__57mm_UnGd_Rkts__HEAT_Frag = (
             6,
-            Weapons.UB_16UM_pod___16_x_S_5KO__57mm_UnGd_Rkts__HEAT_Frag,
+            Weapons.UB_16_57UMP___16_x_UnGd_Rkts__57_mm_S_5KO_HEAT_Frag,
         )
         S_24B___240mm_UnGd_Rkt__235kg__HE_Frag___Low_Smk_ = (
             6,
diff --git a/pydcs_extensions/su30/su30.py b/pydcs_extensions/su30/su30.py
index 244ce987..724cce37 100644
--- a/pydcs_extensions/su30/su30.py
+++ b/pydcs_extensions/su30/su30.py
@@ -718,19 +718,19 @@ class Su_30SM(PlaneType):
         )
         _2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = (
             3,
-            Weapons._2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag,
+            Weapons._2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = (
             3,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = (
             3,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP = (
             3,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
         )
         _2_x_S_25 = (3, Weapons._2_x_S_25)
 
@@ -1621,19 +1621,19 @@ class Su_30SM(PlaneType):
         )
         _2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = (
             10,
-            Weapons._2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag,
+            Weapons._2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = (
             10,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = (
             10,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP = (
             10,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
         )
         _2_x_S_25 = (10, Weapons._2_x_S_25)
 
@@ -2074,19 +2074,19 @@ class Su_30MKA(PlaneType):
         )
         _2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = (
             3,
-            Weapons._2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag,
+            Weapons._2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = (
             3,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = (
             3,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP = (
             3,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
         )
         _2_x_S_25 = (3, Weapons._2_x_S_25)
 
@@ -2766,19 +2766,19 @@ class Su_30MKA(PlaneType):
         )
         _2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = (
             10,
-            Weapons._2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag,
+            Weapons._2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = (
             10,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = (
             10,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP = (
             10,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
         )
         _2_x_S_25 = (10, Weapons._2_x_S_25)
 
@@ -3196,19 +3196,19 @@ class Su_30MKM(PlaneType):
         )
         _2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = (
             3,
-            Weapons._2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag,
+            Weapons._2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = (
             3,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = (
             3,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP = (
             3,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
         )
         _2_x_S_25 = (3, Weapons._2_x_S_25)
         Mk_82___500lb_GP_Bomb_LD = (3, Weapons.Mk_82___500lb_GP_Bomb_LD)
@@ -3823,19 +3823,19 @@ class Su_30MKM(PlaneType):
         )
         _2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = (
             10,
-            Weapons._2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag,
+            Weapons._2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = (
             10,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = (
             10,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP = (
             10,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
         )
         _2_x_S_25 = (10, Weapons._2_x_S_25)
         # ERRR <CLEAN>
@@ -4261,19 +4261,19 @@ class Su_30MKM_AG(PlaneType):
         )
         _2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = (
             3,
-            Weapons._2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag,
+            Weapons._2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = (
             3,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = (
             3,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP = (
             3,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
         )
         _2_x_S_25 = (3, Weapons._2_x_S_25)
         Mk_82___500lb_GP_Bomb_LD = (3, Weapons.Mk_82___500lb_GP_Bomb_LD)
@@ -4888,19 +4888,19 @@ class Su_30MKM_AG(PlaneType):
         )
         _2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = (
             10,
-            Weapons._2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag,
+            Weapons._2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = (
             10,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = (
             10,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP = (
             10,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
         )
         _2_x_S_25 = (10, Weapons._2_x_S_25)
         # ERRR <CLEAN>
@@ -5333,19 +5333,19 @@ class Su_30MKI(PlaneType):
         )
         _2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = (
             3,
-            Weapons._2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag,
+            Weapons._2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = (
             3,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = (
             3,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP = (
             3,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
         )
         _2_x_S_25 = (3, Weapons._2_x_S_25)
 
@@ -5967,19 +5967,19 @@ class Su_30MKI(PlaneType):
         )
         _2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = (
             10,
-            Weapons._2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag,
+            Weapons._2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = (
             10,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = (
             10,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP = (
             10,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
         )
         _2_x_S_25 = (10, Weapons._2_x_S_25)
 
@@ -6416,19 +6416,19 @@ class Su_30MKA_AG(PlaneType):
         )
         _2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = (
             3,
-            Weapons._2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag,
+            Weapons._2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = (
             3,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = (
             3,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP = (
             3,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
         )
         _2_x_S_25 = (3, Weapons._2_x_S_25)
 
@@ -7108,19 +7108,19 @@ class Su_30MKA_AG(PlaneType):
         )
         _2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = (
             10,
-            Weapons._2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag,
+            Weapons._2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = (
             10,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = (
             10,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP = (
             10,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
         )
         _2_x_S_25 = (10, Weapons._2_x_S_25)
 
@@ -7592,19 +7592,19 @@ class Su_30SM_AG(PlaneType):
         )
         _2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = (
             3,
-            Weapons._2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag,
+            Weapons._2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = (
             3,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = (
             3,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP = (
             3,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
         )
         _2_x_S_25 = (3, Weapons._2_x_S_25)
 
@@ -8495,19 +8495,19 @@ class Su_30SM_AG(PlaneType):
         )
         _2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = (
             10,
-            Weapons._2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag,
+            Weapons._2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = (
             10,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = (
             10,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP = (
             10,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
         )
         _2_x_S_25 = (10, Weapons._2_x_S_25)
 
@@ -8938,19 +8938,19 @@ class Su_30MKI_AG(PlaneType):
         )
         _2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = (
             3,
-            Weapons._2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag,
+            Weapons._2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = (
             3,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = (
             3,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP = (
             3,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
         )
         _2_x_S_25 = (3, Weapons._2_x_S_25)
 
@@ -9572,19 +9572,19 @@ class Su_30MKI_AG(PlaneType):
         )
         _2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = (
             10,
-            Weapons._2_x_B_13L_pods___10_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag,
+            Weapons._2_x_B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = (
             10,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange = (
             10,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8TsM_SM_Orange,
         )
         _2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP = (
             10,
-            Weapons._2_x_B_8M1___40_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
+            Weapons._2_x_B_8M1___20_x_UnGd_Rkts__80_mm_S_8OFP2_MPP,
         )
         _2_x_S_25 = (10, Weapons._2_x_S_25)
 
diff --git a/pydcs_extensions/su57/su57.py b/pydcs_extensions/su57/su57.py
index 7f8407fe..df2b43d8 100644
--- a/pydcs_extensions/su57/su57.py
+++ b/pydcs_extensions/su57/su57.py
@@ -115,11 +115,11 @@ class Su_57(PlaneType):
         )
         B_13L_pod___5_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = (
             2,
-            Weapons.B_13L_pod___5_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag,
+            Weapons.B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation,
         )
         S_25_OFM___340mm_UnGd_Rkt__480kg_Penetrator = (
             2,
-            Weapons.S_25_OFM___340mm_UnGd_Rkt__480kg_Penetrator,
+            Weapons.O_25___1_x_UnGd_Rkts__340_mm_S_25_OFM_Hardened_Target_Penetrator,
         )
         BetAB_500___500kg_Concrete_Piercing_Bomb_LD = (
             2,
@@ -236,11 +236,11 @@ class Su_57(PlaneType):
         )
         B_13L_pod___5_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = (
             4,
-            Weapons.B_13L_pod___5_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag,
+            Weapons.B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation,
         )
         S_25_OFM___340mm_UnGd_Rkt__480kg_Penetrator = (
             4,
-            Weapons.S_25_OFM___340mm_UnGd_Rkt__480kg_Penetrator,
+            Weapons.O_25___1_x_UnGd_Rkts__340_mm_S_25_OFM_Hardened_Target_Penetrator,
         )
         BetAB_500___500kg_Concrete_Piercing_Bomb_LD = (
             4,
@@ -365,11 +365,11 @@ class Su_57(PlaneType):
         )
         B_13L_pod___5_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = (
             9,
-            Weapons.B_13L_pod___5_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag,
+            Weapons.B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation,
         )
         S_25_OFM___340mm_UnGd_Rkt__480kg_Penetrator = (
             9,
-            Weapons.S_25_OFM___340mm_UnGd_Rkt__480kg_Penetrator,
+            Weapons.O_25___1_x_UnGd_Rkts__340_mm_S_25_OFM_Hardened_Target_Penetrator,
         )
         BetAB_500___500kg_Concrete_Piercing_Bomb_LD = (
             9,
@@ -479,11 +479,11 @@ class Su_57(PlaneType):
         )
         B_13L_pod___5_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = (
             11,
-            Weapons.B_13L_pod___5_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag,
+            Weapons.B_13L___5_x_UnGd_Rkts__122_mm_S_13OF_Blast_Fragmentation,
         )
         S_25_OFM___340mm_UnGd_Rkt__480kg_Penetrator = (
             11,
-            Weapons.S_25_OFM___340mm_UnGd_Rkt__480kg_Penetrator,
+            Weapons.O_25___1_x_UnGd_Rkts__340_mm_S_25_OFM_Hardened_Target_Penetrator,
         )
         BetAB_500___500kg_Concrete_Piercing_Bomb_LD = (
             11,
diff --git a/pydcs_extensions/super_etendard/super_etendard.py b/pydcs_extensions/super_etendard/super_etendard.py
index 4a0a5c5a..0d24f0e9 100644
--- a/pydcs_extensions/super_etendard/super_etendard.py
+++ b/pydcs_extensions/super_etendard/super_etendard.py
@@ -2,7 +2,6 @@ from dcs import task
 from dcs.planes import PlaneType
 from dcs.weapons_data import Weapons
 
-
 from game.modsupport import planemod
 from pydcs_extensions.weapon_injector import inject_weapons
 
@@ -54,7 +53,7 @@ class VSN_SEM(PlaneType):
         R550_Magic_2_IR_AAM = (1, Weapons.R550_Magic_2_IR_AAM)
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             1,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         ALQ_131___ECM_Pod = (1, Weapons.ALQ_131___ECM_Pod)
         AIM_9M_Sidewinder_IR_AAM = (1, Weapons.AIM_9M_Sidewinder_IR_AAM)
@@ -68,7 +67,7 @@ class VSN_SEM(PlaneType):
         GBU_12___500lb_Laser_Guided_Bomb = (2, Weapons.GBU_12___500lb_Laser_Guided_Bomb)
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             2,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         Mk_81___250lb_GP_Bomb_LD = (2, Weapons.Mk_81___250lb_GP_Bomb_LD)
         Mk_82___500lb_GP_Bomb_LD = (2, Weapons.Mk_82___500lb_GP_Bomb_LD)
@@ -103,7 +102,7 @@ class VSN_SEM(PlaneType):
         )
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             10,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         Mk_81___250lb_GP_Bomb_LD = (10, Weapons.Mk_81___250lb_GP_Bomb_LD)
         Mk_82___500lb_GP_Bomb_LD = (10, Weapons.Mk_82___500lb_GP_Bomb_LD)
@@ -122,7 +121,7 @@ class VSN_SEM(PlaneType):
         R550_Magic_2_IR_AAM = (11, Weapons.R550_Magic_2_IR_AAM)
         LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE = (
             11,
-            Weapons.LAU_61_pod___19_x_2_75_Hydra__UnGd_Rkts_M151__HE,
+            Weapons.LAU_61___19_x_UnGd_Rkts__70_mm_Hydra_70_M151_HE_,
         )
         ALQ_131___ECM_Pod = (11, Weapons.ALQ_131___ECM_Pod)
         AIM_9M_Sidewinder_IR_AAM = (11, Weapons.AIM_9M_Sidewinder_IR_AAM)
diff --git a/qt_ui/main.py b/qt_ui/main.py
index bcf99a15..658c75dd 100644
--- a/qt_ui/main.py
+++ b/qt_ui/main.py
@@ -340,6 +340,7 @@ def create_game(
             su15_flagon=False,
             su30_flanker_h=False,
             su57_felon=False,
+            coldwarassets=False,
             frenchpack=False,
             high_digit_sams=False,
         ),
diff --git a/qt_ui/uiconstants.py b/qt_ui/uiconstants.py
index bcf48851..63bfe1bb 100644
--- a/qt_ui/uiconstants.py
+++ b/qt_ui/uiconstants.py
@@ -219,6 +219,9 @@ def load_aircraft_icons():
     AIRCRAFT_ICONS["Su-30MKI-AG"] = AIRCRAFT_ICONS["Su-30MKI"]
     AIRCRAFT_ICONS["Su-30MKM-AG"] = AIRCRAFT_ICONS["Su-30MKM"]
     AIRCRAFT_ICONS["Su-30SM-AG"] = AIRCRAFT_ICONS["Su-30SM"]
+    AIRCRAFT_ICONS["F-5E-3_FC"] = AIRCRAFT_ICONS["F-5E-3"]
+    AIRCRAFT_ICONS["F-86F_FC"] = AIRCRAFT_ICONS["F-86F Sabre"]
+    AIRCRAFT_ICONS["MiG-15bis_FC"] = AIRCRAFT_ICONS["MiG-15bis"]
 
 
 def load_vehicle_icons():
diff --git a/qt_ui/windows/QUnitInfoWindow.py b/qt_ui/windows/QUnitInfoWindow.py
index 1e617150..004b687f 100644
--- a/qt_ui/windows/QUnitInfoWindow.py
+++ b/qt_ui/windows/QUnitInfoWindow.py
@@ -44,6 +44,8 @@ def aircraft_banner_for(unit_type: AircraftType) -> Path:
         name = "Su-30SM"
     elif unit_type.dcs_id == "F-15ESE":
         name = "F-15E"
+    elif "_FC" in unit_type.dcs_id:
+        name = unit_type.dcs_id.replace("_FC", "")
     else:
         name = unit_type.dcs_id
     return AIRCRAFT_BANNERS_BASE / f"{name}.jpg"
diff --git a/qt_ui/windows/groundobject/QGroundObjectBuyMenu.py b/qt_ui/windows/groundobject/QGroundObjectBuyMenu.py
index 91a51298..1d97ff51 100644
--- a/qt_ui/windows/groundobject/QGroundObjectBuyMenu.py
+++ b/qt_ui/windows/groundobject/QGroundObjectBuyMenu.py
@@ -33,6 +33,8 @@ from game.theater.theatergroundobject import (
     SamGroundObject,
     VehicleGroupGroundObject,
     ShipGroundObject,
+    MissileSiteGroundObject,
+    CoastalSiteGroundObject,
 )
 from qt_ui.uiconstants import EVENT_ICONS
 
@@ -282,6 +284,12 @@ class QGroundObjectBuyMenu(QDialog):
         elif isinstance(ground_object, ShipGroundObject):
             role = GroupRole.NAVAL
             tasks.append(GroupTask.NAVY)
+        elif isinstance(ground_object, MissileSiteGroundObject):
+            role = GroupRole.DEFENSES
+            tasks.append(GroupTask.MISSILE)
+        elif isinstance(ground_object, CoastalSiteGroundObject):
+            role = GroupRole.DEFENSES
+            tasks.append(GroupTask.COASTAL)
         else:
             raise NotImplementedError(f"Unhandled TGO type {ground_object.__class__}")
 
diff --git a/qt_ui/windows/groundobject/QGroundObjectMenu.py b/qt_ui/windows/groundobject/QGroundObjectMenu.py
index e8faeec5..839fb46e 100644
--- a/qt_ui/windows/groundobject/QGroundObjectMenu.py
+++ b/qt_ui/windows/groundobject/QGroundObjectMenu.py
@@ -104,14 +104,14 @@ class QGroundObjectMenu(QDialog):
         self.buy_replace.clicked.connect(self.buy_group)
         self.buy_replace.setProperty("style", "btn-success")
 
-        if self.ground_object.purchasable or self.game.turn == 0:
+        if self.ground_object.purchasable:
+            # if not purchasable but is_iads => naval unit
             if self.total_value > 0:
                 self.actionLayout.addWidget(self.sell_all_button)
             self.actionLayout.addWidget(self.buy_replace)
 
-        if self.show_buy_sell_actions and (
-            self.ground_object.purchasable or self.game.turn == 0
-        ):
+        if self.show_buy_sell_actions and self.ground_object.purchasable:
+            # if not purchasable but is_iads => naval unit
             self.mainLayout.addLayout(self.actionLayout)
         self.setLayout(self.mainLayout)
 
diff --git a/qt_ui/windows/newgame/QNewGameWizard.py b/qt_ui/windows/newgame/QNewGameWizard.py
index e4ee75a7..ce4e4599 100644
--- a/qt_ui/windows/newgame/QNewGameWizard.py
+++ b/qt_ui/windows/newgame/QNewGameWizard.py
@@ -119,6 +119,7 @@ class NewGameWizard(QtWidgets.QWizard):
             high_digit_sams=self.field("high_digit_sams"),
             spanishnavypack=self.field("spanishnavypack"),
             swedishmilitaryassetspack=self.field("swedishmilitaryassetspack"),
+            coldwarassets=self.field("coldwarassets"),
             SWPack=self.field("SWPack"),
         )
 
diff --git a/qt_ui/windows/newgame/WizardPages/QGeneratorSettings.py b/qt_ui/windows/newgame/WizardPages/QGeneratorSettings.py
index a115e1ed..43306117 100644
--- a/qt_ui/windows/newgame/WizardPages/QGeneratorSettings.py
+++ b/qt_ui/windows/newgame/WizardPages/QGeneratorSettings.py
@@ -146,6 +146,8 @@ class GeneratorOptions(QtWidgets.QWizardPage):
         self.registerField("high_digit_sams", self.high_digit_sams)
         self.swedishmilitaryassetspack = QtWidgets.QCheckBox()
         self.registerField("swedishmilitaryassetspack", self.swedishmilitaryassetspack)
+        self.coldwarassets = QtWidgets.QCheckBox()
+        self.registerField("coldwarassets", self.coldwarassets)
         self.SWPack = QtWidgets.QCheckBox()
         self.registerField("SWPack", self.SWPack)
         self.spanishnavypack = QtWidgets.QCheckBox()
@@ -179,7 +181,8 @@ class GeneratorOptions(QtWidgets.QWizardPage):
             ("F-84G Thunderjet (v2.5.7.01)", self.f84g_thunderjet),
             ("F9F Panther (v2.8.7.101)", self.f9f_panther),
             ("F/A-18E/F Super Hornet AI Tanker (version 1.4)", self.fa18ef_tanker),
-            ("F/A-18E/F/G Super Hornet (version 2.2.5)", self.fa_18efg),
+            ("F/A-18E/F/G Super Hornet (version 2.3.2)", self.fa_18efg),
+            ("Cold War Assets mod (v1.0)", self.coldwarassets),
             ("Frenchpack (v4.9.1)", self.frenchpack),
             ("High Digit SAMs", self.high_digit_sams),
             ("IDF Assets Pack (v1.1 by IDF Mods Project)", self.irondome),
diff --git a/requirements.txt b/requirements.txt
index 47a33328..56de0454 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -33,7 +33,7 @@ pluggy==1.5.0
 pre-commit==3.7.1
 pydantic==2.7.4
 pydantic-settings==2.3.3
-pydcs @ git+https://github.com/dcs-retribution/pydcs@4f4d3fd51dc14ad8e16e3bf6b130e8efc18dcabd
+pydcs @ git+https://github.com/dcs-retribution/pydcs@800d8fd887a20ecbe811f9c9bde8f1648fea5588
 pyinstaller==5.13.2
 pyinstaller-hooks-contrib==2024.0
 pyparsing==3.1.2
diff --git a/resources/campaigns/second_afghan_war.miz b/resources/campaigns/second_afghan_war.miz
new file mode 100644
index 00000000..2195d5de
Binary files /dev/null and b/resources/campaigns/second_afghan_war.miz differ
diff --git a/resources/campaigns/second_afghan_war.yaml b/resources/campaigns/second_afghan_war.yaml
new file mode 100644
index 00000000..6e24d827
--- /dev/null
+++ b/resources/campaigns/second_afghan_war.yaml
@@ -0,0 +1,150 @@
+---
+name: Afghanistan - The Second Afghan War
+theater: Afghanistan
+authors: Starfire
+recommended_player_faction: Bluefor Modern
+recommended_enemy_faction: Redfor (Russia) 2010
+description:
+  <p>Meow</p>
+miz: second_afghan_war.miz
+performance: 1
+recommended_start_date: 2001-12-17
+version: "10.7"
+settings:
+  hercules: true
+  squadron_start_full: true
+squadrons:
+  #Kandahar
+  7:
+    - primary: OCA/Runway
+      secondary: air-to-ground
+      aircraft:
+        - B-1B Lancer
+      size: 4
+    - primary: Strike
+      secondary: air-to-ground
+      aircraft:
+        - B-52H Stratofortress
+      size: 4
+    - primary: Transport
+      secondary: any
+      aircraft:
+        - C-130J-30 Super Hercules
+        - C-130
+      size: 2
+    - primary: Refueling
+      aircraft:
+        - KC-135 Stratotanker
+      size: 1
+    - primary: Refueling
+      aircraft:
+        - KC-130J
+        - KC-130
+      size: 1
+    - primary: AEW&C
+      aircraft:
+        - E-3A
+      size: 2
+    - primary: SEAD
+      secondary: any
+      aircraft:
+        - F/A-18C Hornet (Lot 20)
+      size: 12
+    - primary: DEAD
+      secondary: any
+      aircraft:
+        - F-16CM Fighting Falcon (Block 50)
+      size: 16
+    - primary: BAI
+      secondary: any
+      aircraft:
+        - F-15E Strike Eagle (Suite 4+)
+      size: 12
+    - primary: Escort
+      secondary: any
+      aircraft:
+        - F-15C Eagle
+      size: 12
+  # Kandahar Heliport
+  15:  
+    - primary: Air Assault
+      secondary: any
+      aircraft:
+        - UH-60A
+      size: 4
+    - primary: Transport
+      secondary: any
+      aircraft:
+        - CH-47D
+      size: 4      
+  #Camp Bastion
+  10:
+    - primary: BAI
+      secondary: air-to-ground
+      aircraft:
+        - AV-8B Harrier II Night Attack
+      size: 12
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - A-10C Thunderbolt II (Suite 7)
+      size: 12
+  #Camp Bastion Heliport
+  13:
+    - primary: CAS
+      secondary: any
+      aircraft:
+        - AH-64D Apache Longbow
+      size: 8
+    - primary: CAS
+      secondary: any
+      aircraft:
+        - OH-58D(R) Kiowa Warrior
+      size: 8
+  #Shindand
+  3:
+    - primary: BAI
+      secondary: air-to-ground
+      aircraft:
+        - Su-25T Frogfoot
+      size: 16
+    - primary: TARCAP
+      secondary: air-to-air
+      aircraft:
+        - Su-27 Flanker-B
+      size: 12
+    - primary: SEAD
+      secondary: air-to-ground
+      aircraft:
+        - Su-24M Fencer-D
+      size: 16
+  #Shindand Heliport
+  14:
+    - primary: Air Assault
+      secondary: any
+      aircraft:
+        - Mi-24P Hind-F
+      size: 4
+    - primary: CAS
+      secondary: any
+      aircraft:
+         - Ka-50 Hokum III
+         - Ka-50 Hokum (Blackshark 3)
+      size: 4
+    - primary: Transport
+      secondary: any
+      aircraft:
+        - Mi-8MTV2 Hip
+      size: 4      
+  #Herat
+  1:
+    - primary: DEAD
+      secondary: air-to-ground
+      aircraft:
+        - Su-34 Fullback
+      size: 12
+    - primary: Escort
+      secondary: air-to-air
+      aircraft:
+        - MiG-29S Fulcrum-C
+      size: 12
\ No newline at end of file
diff --git a/resources/customized_payloads/B_47.lua b/resources/customized_payloads/B_47.lua
new file mode 100644
index 00000000..b77c8168
--- /dev/null
+++ b/resources/customized_payloads/B_47.lua
@@ -0,0 +1,57 @@
+local unitPayloads = {
+	["name"] = "B_47",
+	["payloads"] = {
+		[1] = {
+			["name"] = "STRIKE",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{B_29_RASCALARM}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 33,
+			},
+		},
+		[2] = {
+			["name"] = "ANTISHIP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{B_29_RASCALARM}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 33,
+			},
+		},
+		[3] = {
+			["name"] = "Retribution OCA/Runway",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{B_29_RASCALARM}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 33,
+			},
+		},
+		[4] = {
+			["name"] = "SEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{B_29_RASCALARM}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 33,
+			},
+		},
+	},
+	["tasks"] = {
+	},
+	["unitType"] = "B_47",
+}
+return unitPayloads
diff --git a/resources/customized_payloads/F-5E-3_FC.lua b/resources/customized_payloads/F-5E-3_FC.lua
new file mode 100644
index 00000000..27f16880
--- /dev/null
+++ b/resources/customized_payloads/F-5E-3_FC.lua
@@ -0,0 +1,284 @@
+local unitPayloads = {
+	["name"] = "F-5E FC",
+	["payloads"] = {
+		[1] = {
+			["name"] = "Retribution BARCAP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{AIM-9P5}",
+					["num"] = 7,
+				},
+				[2] = {
+					["CLSID"] = "{0395076D-2F77-4420-9D33-087A4398130B}",
+					["num"] = 4,
+				},
+				[3] = {
+					["CLSID"] = "{AIM-9P5}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[2] = {
+			["displayName"] = "Retribution TARCAP",
+			["name"] = "Retribution TARCAP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{AIM-9P5}",
+					["num"] = 7,
+				},
+				[2] = {
+					["CLSID"] = "{0395076D-2F77-4420-9D33-087A4398130B}",
+					["num"] = 4,
+				},
+				[3] = {
+					["CLSID"] = "{AIM-9P5}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[3] = {
+			["displayName"] = "Retribution Escort",
+			["name"] = "Retribution Escort",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{AIM-9P5}",
+					["num"] = 7,
+				},
+				[2] = {
+					["CLSID"] = "{0395076D-2F77-4420-9D33-087A4398130B}",
+					["num"] = 4,
+				},
+				[3] = {
+					["CLSID"] = "{AIM-9P5}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[4] = {
+			["displayName"] = "Retribution Fighter Sweep",
+			["name"] = "Retribution Fighter Sweep",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{AIM-9P5}",
+					["num"] = 7,
+				},
+				[2] = {
+					["CLSID"] = "{0395076D-2F77-4420-9D33-087A4398130B}",
+					["num"] = 4,
+				},
+				[3] = {
+					["CLSID"] = "{AIM-9P5}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[5] = {
+			["displayName"] = "Retribution BAI",
+			["name"] = "Retribution BAI",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{AIM-9P5}",
+					["num"] = 7,
+				},
+				[2] = {
+					["CLSID"] = "{0395076D-2F77-4420-9D33-087A4398130B}",
+					["num"] = 4,
+				},
+				[3] = {
+					["CLSID"] = "{AIM-9P5}",
+					["num"] = 1,
+				},
+				[4] = {
+					["CLSID"] = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}",
+					["num"] = 5,
+					["settings"] = {
+						["NFP_VIS_DrawArgNo_57"] = 0,
+						["NFP_fuze_type_nose"] = "M904E4",
+						["NFP_fuze_type_tail"] = "M905",
+						["arm_delay_ctrl_M904E4"] = 2,
+						["arm_delay_ctrl_M905"] = 4,
+						["function_delay_ctrl_M904E4"] = 0,
+						["function_delay_ctrl_M905"] = 0,
+					},
+				},
+				[5] = {
+					["CLSID"] = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}",
+					["num"] = 3,
+					["settings"] = {
+						["NFP_VIS_DrawArgNo_57"] = 0,
+						["NFP_fuze_type_nose"] = "M904E4",
+						["NFP_fuze_type_tail"] = "M905",
+						["arm_delay_ctrl_M904E4"] = 2,
+						["arm_delay_ctrl_M905"] = 4,
+						["function_delay_ctrl_M904E4"] = 0,
+						["function_delay_ctrl_M905"] = 0,
+					},
+				},
+				[6] = {
+					["CLSID"] = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}",
+					["num"] = 6,
+					["settings"] = {
+						["NFP_VIS_DrawArgNo_57"] = 0,
+						["NFP_fuze_type_nose"] = "M904E4",
+						["NFP_fuze_type_tail"] = "M905",
+						["arm_delay_ctrl_M904E4"] = 2,
+						["arm_delay_ctrl_M905"] = 4,
+						["function_delay_ctrl_M904E4"] = 0,
+						["function_delay_ctrl_M905"] = 0,
+					},
+				},
+				[7] = {
+					["CLSID"] = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}",
+					["num"] = 2,
+					["settings"] = {
+						["NFP_VIS_DrawArgNo_57"] = 0,
+						["NFP_fuze_type_nose"] = "M904E4",
+						["NFP_fuze_type_tail"] = "M905",
+						["arm_delay_ctrl_M904E4"] = 2,
+						["arm_delay_ctrl_M905"] = 4,
+						["function_delay_ctrl_M904E4"] = 0,
+						["function_delay_ctrl_M905"] = 0,
+					},
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[6] = {
+			["displayName"] = "Retribution CAS",
+			["name"] = "Retribution CAS",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{AIM-9P5}",
+					["num"] = 7,
+				},
+				[2] = {
+					["CLSID"] = "{0395076D-2F77-4420-9D33-087A4398130B}",
+					["num"] = 4,
+				},
+				[3] = {
+					["CLSID"] = "{AIM-9P5}",
+					["num"] = 1,
+				},
+				[4] = {
+					["CLSID"] = "{CBU-52B}",
+					["num"] = 5,
+				},
+				[5] = {
+					["CLSID"] = "{CBU-52B}",
+					["num"] = 3,
+				},
+				[6] = {
+					["CLSID"] = "{CBU-52B}",
+					["num"] = 6,
+				},
+				[7] = {
+					["CLSID"] = "{CBU-52B}",
+					["num"] = 2,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[7] = {
+			["displayName"] = "Retribution Strike",
+			["name"] = "Retribution Strike",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{AIM-9P5}",
+					["num"] = 7,
+				},
+				[2] = {
+					["CLSID"] = "{0395076D-2F77-4420-9D33-087A4398130B}",
+					["num"] = 4,
+				},
+				[3] = {
+					["CLSID"] = "{AIM-9P5}",
+					["num"] = 1,
+				},
+				[4] = {
+					["CLSID"] = "{7A44FF09-527C-4B7E-B42B-3F111CFE50FB}",
+					["num"] = 5,
+					["settings"] = {
+						["NFP_VIS_DrawArgNo_57"] = 0,
+						["NFP_fuze_type_nose"] = "M904E4",
+						["NFP_fuze_type_tail"] = "M905",
+						["arm_delay_ctrl_M904E4"] = 2,
+						["arm_delay_ctrl_M905"] = 4,
+						["function_delay_ctrl_M904E4"] = 0,
+						["function_delay_ctrl_M905"] = 0,
+					},
+				},
+				[5] = {
+					["CLSID"] = "{7A44FF09-527C-4B7E-B42B-3F111CFE50FB}",
+					["num"] = 3,
+					["settings"] = {
+						["NFP_VIS_DrawArgNo_57"] = 0,
+						["NFP_fuze_type_nose"] = "M904E4",
+						["NFP_fuze_type_tail"] = "M905",
+						["arm_delay_ctrl_M904E4"] = 2,
+						["arm_delay_ctrl_M905"] = 4,
+						["function_delay_ctrl_M904E4"] = 0,
+						["function_delay_ctrl_M905"] = 0,
+					},
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[8] = {
+			["displayName"] = "Retribution OCA/Aircraft",
+			["name"] = "Retribution OCA/Aircraft",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{AIM-9P5}",
+					["num"] = 7,
+				},
+				[2] = {
+					["CLSID"] = "{0395076D-2F77-4420-9D33-087A4398130B}",
+					["num"] = 4,
+				},
+				[3] = {
+					["CLSID"] = "{AIM-9P5}",
+					["num"] = 1,
+				},
+				[4] = {
+					["CLSID"] = "LAU3_HE5",
+					["num"] = 5,
+				},
+				[5] = {
+					["CLSID"] = "LAU3_HE5",
+					["num"] = 3,
+				},
+				[6] = {
+					["CLSID"] = "LAU3_HE5",
+					["num"] = 6,
+				},
+				[7] = {
+					["CLSID"] = "LAU3_HE5",
+					["num"] = 2,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+	},
+	["unitType"] = "F-5E-3_FC",
+}
+return unitPayloads
diff --git a/resources/customized_payloads/F-86F_FC.lua b/resources/customized_payloads/F-86F_FC.lua
new file mode 100644
index 00000000..7b856010
--- /dev/null
+++ b/resources/customized_payloads/F-86F_FC.lua
@@ -0,0 +1,223 @@
+local unitPayloads = {
+	["name"] = "F-86F_FC",
+	["payloads"] = {
+		[1] = {
+			["name"] = "Retribution BARCAP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{GAR-8}",
+					["num"] = 6,
+				},
+				[2] = {
+					["CLSID"] = "{GAR-8}",
+					["num"] = 5,
+				},
+				[3] = {
+					["CLSID"] = "{PTB_120_F86F35}",
+					["num"] = 7,
+				},
+				[4] = {
+					["CLSID"] = "{PTB_120_F86F35}",
+					["num"] = 4,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[2] = {
+			["displayName"] = "Retribution TARCAP",
+			["name"] = "Retribution TARCAP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{PTB_120_F86F35}",
+					["num"] = 7,
+				},
+				[2] = {
+					["CLSID"] = "{PTB_120_F86F35}",
+					["num"] = 4,
+				},
+				[3] = {
+					["CLSID"] = "{GAR-8}",
+					["num"] = 6,
+				},
+				[4] = {
+					["CLSID"] = "{GAR-8}",
+					["num"] = 5,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[3] = {
+			["name"] = "Retribution BAI",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{HVARx2}",
+					["num"] = 7,
+				},
+				[2] = {
+					["CLSID"] = "{HVARx2}",
+					["num"] = 4,
+				},
+				[3] = {
+					["CLSID"] = "{HVARx2}",
+					["num"] = 8,
+				},
+				[4] = {
+					["CLSID"] = "{HVARx2}",
+					["num"] = 3,
+				},
+				[5] = {
+					["CLSID"] = "{PTB_120_F86F35}",
+					["num"] = 10,
+				},
+				[6] = {
+					["CLSID"] = "{PTB_120_F86F35}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[4] = {
+			["displayName"] = "Retribution Fighter Sweep",
+			["name"] = "Retribution Fighter Sweep",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{PTB_120_F86F35}",
+					["num"] = 7,
+				},
+				[2] = {
+					["CLSID"] = "{PTB_120_F86F35}",
+					["num"] = 4,
+				},
+				[3] = {
+					["CLSID"] = "{GAR-8}",
+					["num"] = 6,
+				},
+				[4] = {
+					["CLSID"] = "{GAR-8}",
+					["num"] = 5,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[5] = {
+			["displayName"] = "Retribution Escort",
+			["name"] = "Retribution Escort",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{PTB_120_F86F35}",
+					["num"] = 7,
+				},
+				[2] = {
+					["CLSID"] = "{PTB_120_F86F35}",
+					["num"] = 4,
+				},
+				[3] = {
+					["CLSID"] = "{GAR-8}",
+					["num"] = 6,
+				},
+				[4] = {
+					["CLSID"] = "{GAR-8}",
+					["num"] = 5,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[6] = {
+			["displayName"] = "Retribution CAS",
+			["name"] = "Retribution CAS",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{HVARx2}",
+					["num"] = 7,
+				},
+				[2] = {
+					["CLSID"] = "{HVARx2}",
+					["num"] = 4,
+				},
+				[3] = {
+					["CLSID"] = "{HVARx2}",
+					["num"] = 8,
+				},
+				[4] = {
+					["CLSID"] = "{HVARx2}",
+					["num"] = 3,
+				},
+				[5] = {
+					["CLSID"] = "{PTB_120_F86F35}",
+					["num"] = 10,
+				},
+				[6] = {
+					["CLSID"] = "{PTB_120_F86F35}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[7] = {
+			["displayName"] = "Retribution Strike",
+			["name"] = "Retribution Strike",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{00F5DAC4-0466-4122-998F-B1A298E34113}",
+					["num"] = 7,
+				},
+				[2] = {
+					["CLSID"] = "{00F5DAC4-0466-4122-998F-B1A298E34113}",
+					["num"] = 4,
+				},
+				[3] = {
+					["CLSID"] = "{PTB_120_F86F35}",
+					["num"] = 10,
+				},
+				[4] = {
+					["CLSID"] = "{PTB_120_F86F35}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[8] = {
+			["displayName"] = "Retribution OCA/Aircraft",
+			["name"] = "Retribution OCA/Aircraft",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{00F5DAC4-0466-4122-998F-B1A298E34113}",
+					["num"] = 7,
+				},
+				[2] = {
+					["CLSID"] = "{00F5DAC4-0466-4122-998F-B1A298E34113}",
+					["num"] = 4,
+				},
+				[3] = {
+					["CLSID"] = "{PTB_120_F86F35}",
+					["num"] = 10,
+				},
+				[4] = {
+					["CLSID"] = "{PTB_120_F86F35}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+	},
+	["tasks"] = {
+	},
+	["unitType"] = "F-86F_FC",
+}
+return unitPayloads
diff --git a/resources/customized_payloads/MiG-15bis_FC.lua b/resources/customized_payloads/MiG-15bis_FC.lua
new file mode 100644
index 00000000..b63afcc4
--- /dev/null
+++ b/resources/customized_payloads/MiG-15bis_FC.lua
@@ -0,0 +1,144 @@
+local unitPayloads = {
+	["name"] = "MiG-15bis_FC",
+	["payloads"] = {
+		[1] = {
+			["name"] = "Retribution BARCAP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "PTB600_MIG15",
+					["num"] = 2,
+				},
+				[2] = {
+					["CLSID"] = "PTB600_MIG15",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[2] = {
+			["displayName"] = "Retribution TARCAP",
+			["name"] = "Retribution TARCAP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "PTB600_MIG15",
+					["num"] = 2,
+				},
+				[2] = {
+					["CLSID"] = "PTB600_MIG15",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[3] = {
+			["displayName"] = "Retribution Escort",
+			["name"] = "Retribution Escort",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "PTB600_MIG15",
+					["num"] = 2,
+				},
+				[2] = {
+					["CLSID"] = "PTB600_MIG15",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[4] = {
+			["displayName"] = "Retribution Fighter Sweep",
+			["name"] = "Retribution Fighter Sweep",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "PTB600_MIG15",
+					["num"] = 2,
+				},
+				[2] = {
+					["CLSID"] = "PTB600_MIG15",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[5] = {
+			["displayName"] = "Retribution BAI",
+			["name"] = "Retribution BAI",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "FAB_100M",
+					["num"] = 2,
+				},
+				[2] = {
+					["CLSID"] = "FAB_100M",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[6] = {
+			["displayName"] = "Retribution CAS",
+			["name"] = "Retribution CAS",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "FAB_100M",
+					["num"] = 2,
+				},
+				[2] = {
+					["CLSID"] = "FAB_100M",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[7] = {
+			["displayName"] = "Retribution Strike",
+			["name"] = "Retribution Strike",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "FAB_100M",
+					["num"] = 2,
+				},
+				[2] = {
+					["CLSID"] = "FAB_100M",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[8] = {
+			["displayName"] = "Retribution OCA/Aircraft",
+			["name"] = "Retribution OCA/Aircraft",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "FAB_100M",
+					["num"] = 2,
+				},
+				[2] = {
+					["CLSID"] = "FAB_100M",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+	},
+	["tasks"] = {
+	},
+	["unitType"] = "MiG-15bis_FC",
+}
+return unitPayloads
diff --git a/resources/customized_payloads/Tu-16.lua b/resources/customized_payloads/Tu-16.lua
new file mode 100644
index 00000000..77463c46
--- /dev/null
+++ b/resources/customized_payloads/Tu-16.lua
@@ -0,0 +1,82 @@
+local unitPayloads = {
+	["name"] = "Tu-16",
+	["payloads"] = {
+		[1] = {
+			["name"] = "STRIKE",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{TU_16_KSR5}",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "{BDAD04AA-4D4A-4E51-B958-180A89F963CF}",
+					["num"] = 3,
+				},
+				[3] = {
+					["CLSID"] = "{TU_16_KSR5}",
+					["num"] = 4,
+				},
+			},
+			["tasks"] = {
+				[1] = 33,
+			},
+		},
+		[2] = {
+			["name"] = "ANTISHIP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{TU_16_KSR5}",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "{TU_16_KSR5}",
+					["num"] = 4,
+				},
+			},
+			["tasks"] = {
+				[1] = 15,
+			},
+		},
+		[3] = {
+			["displayName"] = "SEAD",
+			["name"] = "SEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{TU_16_KSR5ARM}",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "{TU_16_KSR5ARM}",
+					["num"] = 4,
+				},
+			},
+			["tasks"] = {
+				[1] = 15,
+			},
+		},
+		[4] = {
+			["name"] = "CAS",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{TU_16_KSR5}",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "{BDAD04AA-4D4A-4E51-B958-180A89F963CF}",
+					["num"] = 3,
+				},
+				[3] = {
+					["CLSID"] = "{TU_16_KSR5}",
+					["num"] = 4,
+				},
+			},
+			["tasks"] = {
+				[1] = 33,
+			},
+		},
+	},
+	["tasks"] = {
+	},
+	["unitType"] = "Tu-16",
+}
+return unitPayloads
diff --git a/resources/customized_payloads/Tu-4K.lua b/resources/customized_payloads/Tu-4K.lua
new file mode 100644
index 00000000..93108a7a
--- /dev/null
+++ b/resources/customized_payloads/Tu-4K.lua
@@ -0,0 +1,57 @@
+local unitPayloads = {
+	["name"] = "Tu-4K",
+	["payloads"] = {
+		[1] = {
+			["name"] = "STRIKE",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{Tu4_KS_1}",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "{Tu4_KS_1}",
+					["num"] = 2,
+				},
+			},
+			["tasks"] = {
+				[1] = 32,
+			},
+		},
+		[2] = {
+			["name"] = "ANTISHIP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{Tu4_KS_1}",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "{Tu4_KS_1}",
+					["num"] = 2,
+				},
+			},
+			["tasks"] = {
+				[1] = 33,
+			},
+		},
+		[3] = {
+			["name"] = "Retribution OCA/Runway",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{Tu4_KS_1}",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "{Tu4_KS_1}",
+					["num"] = 2,
+				},
+			},
+			["tasks"] = {
+				[1] = 33,
+			},
+		},
+	},
+	["tasks"] = {
+	},
+	["unitType"] = "Tu-4K",
+}
+return unitPayloads
diff --git a/resources/customized_payloads/tu_22D.lua b/resources/customized_payloads/tu_22D.lua
new file mode 100644
index 00000000..35203af4
--- /dev/null
+++ b/resources/customized_payloads/tu_22D.lua
@@ -0,0 +1,41 @@
+local unitPayloads = {
+	["name"] = "tu_22D",
+	["payloads"] = {
+		[1] = {
+			["name"] = "STRIKE",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{D9179118-E42F-47DE-A483-A6C2EA7B4F38}",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 2,
+				},
+			},
+			["tasks"] = {
+				[1] = 32,
+			},
+		},
+		[2] = {
+			["name"] = "CAS",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "{BDAD04AA-4D4A-4E51-B958-180A89F963CF}",
+					["num"] = 2,
+				},
+			},
+			["tasks"] = {
+				[1] = 32,
+			},
+		},
+	},
+	["tasks"] = {
+	},
+	["unitType"] = "tu_22D",
+}
+return unitPayloads
diff --git a/resources/customized_payloads/tu_22KD.lua b/resources/customized_payloads/tu_22KD.lua
new file mode 100644
index 00000000..d2150681
--- /dev/null
+++ b/resources/customized_payloads/tu_22KD.lua
@@ -0,0 +1,111 @@
+local unitPayloads = {
+	["name"] = "tu_22KD",
+	["payloads"] = {
+		[1] = {
+			["name"] = "STRIKE",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "{D9179118-E42F-47DE-A483-A6C2EA7B4F38}",
+					["num"] = 2,
+				},
+				[3] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 3,
+				},
+			},
+			["tasks"] = {
+				[1] = 32,
+			},
+		},
+		[2] = {
+			["displayName"] = "CAS",
+			["name"] = "CAS",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 2,
+				},
+				[3] = {
+					["CLSID"] = "{BDAD04AA-4D4A-4E51-B958-180A89F963CF}",
+					["num"] = 3,
+				},
+			},
+			["tasks"] = {
+				[1] = 32,
+			},
+		},
+		[3] = {
+			["name"] = "SEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{TU_22_KH22P}",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 2,
+				},
+				[3] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 3,
+				},
+			},
+			["tasks"] = {
+				[1] = 32,
+			},
+		},
+		[4] = {
+			["name"] = "ANTISHIP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{12429ECF-03F0-4DF6-BCBD-5D38B6343DE1}",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 2,
+				},
+				[3] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 3,
+				},
+			},
+			["tasks"] = {
+				[1] = 32,
+			},
+		},
+		[5] = {
+			["displayName"] = "DEAD",
+			["name"] = "DEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 2,
+				},
+				[2] = {
+					["CLSID"] = "{Tu_22_Kh22PSI}",
+					["num"] = 1,
+				},
+				[3] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 3,
+				},
+			},
+			["tasks"] = {
+				[1] = 32,
+			},
+		},
+	},
+	["tasks"] = {
+	},
+	["unitType"] = "tu_22KD",
+}
+return unitPayloads
diff --git a/resources/dcs/beacons/afghanistan.json b/resources/dcs/beacons/afghanistan.json
new file mode 100644
index 00000000..f2bc1a76
--- /dev/null
+++ b/resources/dcs/beacons/afghanistan.json
@@ -0,0 +1,65 @@
+{
+ "airfield10_0": {
+  "name": "Bastion",
+  "callsign": "BS",
+  "beacon_type": 8,
+  "hertz": 423000,
+  "channel": null
+ },
+ "airfield10_1": {
+  "name": "Bastion",
+  "callsign": "BAS",
+  "beacon_type": 4,
+  "hertz": 115100000,
+  "channel": 98
+ },
+ "airfield11_0": {
+  "name": "Dwyer",
+  "callsign": "ADY",
+  "beacon_type": 4,
+  "hertz": null,
+  "channel": 46
+ },
+ "airfield1_0": {
+  "name": "Herat",
+  "callsign": "AHR",
+  "beacon_type": 3,
+  "hertz": 116200000,
+  "channel": 109
+ },
+ "airfield1_1": {
+  "name": "Herat",
+  "callsign": "HRT",
+  "beacon_type": 8,
+  "hertz": 412000,
+  "channel": null
+ },
+ "airfield1_2": {
+  "name": "Herat",
+  "callsign": "HRT",
+  "beacon_type": 4,
+  "hertz": null,
+  "channel": 54
+ },
+ "airfield7_0": {
+  "name": "Kandahar",
+  "callsign": "KAF",
+  "beacon_type": 4,
+  "hertz": null,
+  "channel": 75
+ },
+ "airfield7_1": {
+  "name": "Kandahar",
+  "callsign": "KDR",
+  "beacon_type": 3,
+  "hertz": 116000000,
+  "channel": 107
+ },
+ "airfield3_0": {
+  "name": "Shindand",
+  "callsign": "ASD",
+  "beacon_type": 4,
+  "hertz": 111100000,
+  "channel": 48
+ }
+}
\ No newline at end of file
diff --git a/resources/dcs/beacons/falklands.json b/resources/dcs/beacons/falklands.json
index ad9aaba7..b7cb94af 100644
--- a/resources/dcs/beacons/falklands.json
+++ b/resources/dcs/beacons/falklands.json
@@ -171,7 +171,7 @@
   "name": "BIO",
   "callsign": "BIO",
   "beacon_type": 9,
-  "hertz": 205000000,
+  "hertz": 205000,
   "channel": null
  },
  "airfield11_0": {
diff --git a/resources/dcs/beacons/kola.json b/resources/dcs/beacons/kola.json
index 5c1d349d..15eeae0a 100644
--- a/resources/dcs/beacons/kola.json
+++ b/resources/dcs/beacons/kola.json
@@ -126,10 +126,10 @@
   "channel": null
  },
  "airfield7_5": {
-  "name": "bodo",
-  "callsign": "boo",
+  "name": "BODO",
+  "callsign": "BOO",
   "beacon_type": 4,
-  "hertz": 110800000,
+  "hertz": null,
   "channel": 45
  },
  "airfield1_0": {
diff --git a/resources/factions/bluefor_modern.json b/resources/factions/bluefor_modern.json
index aeb2e149..dafabdf0 100644
--- a/resources/factions/bluefor_modern.json
+++ b/resources/factions/bluefor_modern.json
@@ -16,7 +16,7 @@
     "B-52H Stratofortress",
     "C-130",
     "C-130J-30 Super Hercules",
-	"CH-47D",
+    "CH-47D",
     "F-14B Tomcat",
     "F-15C Eagle",
     "F-15D Baz",
@@ -24,16 +24,16 @@
     "F-15E Strike Eagle (Suite 4+)",
     "F-16A MLU",
     "F-16CM Fighting Falcon (Block 50)",
-	"F-16D Fighting Falcon (Block 52+)",
-	"F-16D Fighting Falcon (Block 52)",
-	"F-16D Fighting Falcon (Block 50+)",
-	"F-16D Fighting Falcon (Block 50)",
+    "F-16D Fighting Falcon (Block 52+)",
+    "F-16D Fighting Falcon (Block 52)",
+    "F-16D Fighting Falcon (Block 50+)",
+    "F-16D Fighting Falcon (Block 50)",
     "F-22A Raptor",
     "F-5E Tiger II",
     "F/A-18C Hornet (Lot 20)",
-	"F/A-18E Super Hornet",
-	"F/A-18F Super Hornet",
-	"EA-18G Growler",
+    "F/A-18E Super Hornet",
+    "F/A-18F Super Hornet",
+    "EA-18G Growler",
     "JF-17 Thunder",
     "Ka-50 Hokum",
     "Ka-50 Hokum III",
@@ -77,6 +77,8 @@
     "S-3B Tanker"
   ],
   "frontline_units": [
+    "MBT M1A2C SEP v3 Abrams",
+    "APC MRAP MaxxPro",
     "LAV-25",
     "Leopard 2",
     "M1043 HMMWV (M2 HMG)",
@@ -153,4 +155,4 @@
     "Su-25T Frogfoot": ["af standard 101"],
     "Su-27 Flanker-B": ["Air Force Ukraine Standard"]
   }
-}
\ No newline at end of file
+}
diff --git a/resources/factions/soviet_union_1965.json b/resources/factions/soviet_union_1965.json
new file mode 100644
index 00000000..462fdad9
--- /dev/null
+++ b/resources/factions/soviet_union_1965.json
@@ -0,0 +1,69 @@
+{
+  "country": "USSR",
+  "name": "Soviet Union 1965",
+  "authors": "Ghosti",
+  "description": "<p>Soviet armed forces in the 60s, unsing the Cold War Assets mod by tripod3.</p>",
+  "locales": [
+    "ru_RU"
+  ],
+  "aircrafts": [
+    "Mi-8MTV2 Hip",
+    "MiG-15bis Fagot",
+    "MiG-19P Farmer-B",
+    "MiG-21bis Fishbed-N",
+    "Tu-4K Bull",
+    "Tu-16 Badger-B",
+    "Tu-22D Blinder",
+    "Tu-22KD Blinder",
+    "Tu-95MS Bear-H"
+  ],
+  "awacs": [
+    "A-50"
+  ],
+  "tankers": [
+    "IL-78M"
+  ],
+  "frontline_units": [
+    "BMD-1",
+    "BMP-1",
+    "BRDM-2",
+    "BTR-80",
+    "BTR-D",
+    "PT-76",
+    "S-60 57mm",
+    "T-55A",
+    "ZSU-57-2 'Sparka'",
+    "ZU-23 on Ural-375"
+  ],
+  "artillery_units": [
+    "BM-21 Grad"
+  ],
+  "logistics_units": [
+    "LUV UAZ-469 Jeep",
+    "Truck Ural-375"
+  ],
+  "infantry_units": [
+    "Infantry AK-74 Rus",
+    "Infantry RPG"
+  ],
+  "missiles": [],
+  "preset_groups": [
+    "SA-2/S-75",
+    "SA-3/S-125",
+    "Cold-War-Flak",
+    "KS-19/SON-9"
+  ],
+  "naval_units": [],
+  "air_defense_units": [
+    "SAM P19 \"Flat Face\" SR (SA-2/3)",
+    "ZSU-57-2 'Sparka'",
+    "AAA ZU-23 Closed Emplacement",
+    "ZU-23 on Ural-375",
+    "ZSU-23-4 Shilka"
+  ],
+  "helicopter_carrier_names": [],
+  "requirements": {},
+  "carrier_names": [],
+  "has_jtac": false,
+  "doctrine": "coldwar"
+}
\ No newline at end of file
diff --git a/resources/factions/usn_2009.json b/resources/factions/usn_2009.json
index 004fb9d8..48392202 100644
--- a/resources/factions/usn_2009.json
+++ b/resources/factions/usn_2009.json
@@ -11,7 +11,7 @@
     "F/A-18C Hornet (Lot 20)",
 	"F/A-18E Super Hornet",
 	"F/A-18F Super Hornet",
-    "EA-18G Growler",
+  "EA-18G Growler",
     "EA-6B Prowler",
     "AV-8B Harrier II Night Attack",
     "AH-1W SuperCobra",
diff --git a/resources/plugins/splashdamage2/Splash_Damage_2_0.lua b/resources/plugins/splashdamage2/Splash_Damage_2_0.lua
index bba9aea5..b823462f 100644
--- a/resources/plugins/splashdamage2/Splash_Damage_2_0.lua
+++ b/resources/plugins/splashdamage2/Splash_Damage_2_0.lua
@@ -541,6 +541,20 @@ function track_wpns()
 end
 
 function onWpnEvent(event)
+  --[[
+    What follows is a work-around for what is presumed to be a DCS-bug:
+    https://forum.dcs.world/topic/353679-possible-bug-in-objectgettypename-during-s_event_kill/
+  ]]--
+  if event.weapon then
+    local status, retval = pcall(event.weapon.getTypeName, event.weapon)
+    if not status then
+      -- gameMsg(tostring(event.id)..'  WTF?\n'..tostring(retval))
+      -- gameMsg(mist.utils.tableShow(event))
+      -- gameMsg(tostring(event.weapon.getTypeName))
+      return
+    end
+  end
+  -- end of work-around
   if event.weapon and ignoredWeaps[event.weapon:getTypeName()] then
     return
   end
@@ -550,7 +564,6 @@ function onWpnEvent(event)
       return  --we wont track these types of weapons, so exit here
     end
     env.info(event.weapon:getTypeName().." missing from Splash Damage script")
-    debugMsg(event.weapon:getTypeName().." missing from Splash Damage script")
     if splash_damage_options.weapon_missing_message == true then
       debugMsg(event.weapon:getTypeName().." missing from Splash Damage script")
       debugMsg("desc: "..mist.utils.tableShow(event.weapon:getDesc()))
diff --git a/resources/theaters/afghanistan/icon.gif b/resources/theaters/afghanistan/icon.gif
new file mode 100644
index 00000000..a516ac97
Binary files /dev/null and b/resources/theaters/afghanistan/icon.gif differ
diff --git a/resources/theaters/afghanistan/info.yaml b/resources/theaters/afghanistan/info.yaml
new file mode 100644
index 00000000..97e27401
--- /dev/null
+++ b/resources/theaters/afghanistan/info.yaml
@@ -0,0 +1,48 @@
+---
+name: Afghanistan
+timezone: +4.5
+daytime:
+  dawn: [4, 6]
+  day: [6, 17]
+  dusk: [17, 19]
+  night: [20, 3]
+climate:
+  day_night_temperature_difference: 10.67
+  seasons:
+    winter:
+      average_pressure: 30.09
+      average_temperature: 2.0
+      weather:
+        thunderstorm: 1
+        raining: 20
+        cloudy: 40
+        clear: 40
+    spring:
+      average_pressure: 30.09
+      average_temperature: 15.0
+      weather:
+        thunderstorm: 1
+        raining: 40
+        cloudy: 40
+        clear: 20
+    summer:
+      average_pressure: 29.80
+      average_temperature: 26.0
+      weather:
+        thunderstorm: 1
+        raining: 30
+        cloudy: 30
+        clear: 40
+    fall:
+      average_pressure: 29.88
+      average_temperature: 16.0
+      weather:
+        thunderstorm: 1
+        raining: 20
+        cloudy: 50
+        clear: 30
+  turbulence:
+    high_avg_yearly_turbulence_per_10cm: 19
+    low_avg_yearly_turbulence_per_10cm: 2.5
+    solar_noon_turbulence_per_10cm: 4.5
+    midnight_turbulence_per_10cm: -2.5
\ No newline at end of file
diff --git a/resources/theaters/afghanistan/landmap.p b/resources/theaters/afghanistan/landmap.p
new file mode 100644
index 00000000..97dbe19e
Binary files /dev/null and b/resources/theaters/afghanistan/landmap.p differ
diff --git a/resources/ui/units/aircrafts/banners/B_47.jpg b/resources/ui/units/aircrafts/banners/B_47.jpg
new file mode 100644
index 00000000..cdc4964a
Binary files /dev/null and b/resources/ui/units/aircrafts/banners/B_47.jpg differ
diff --git a/resources/ui/units/aircrafts/banners/Tu-16.jpg b/resources/ui/units/aircrafts/banners/Tu-16.jpg
new file mode 100644
index 00000000..e4f99453
Binary files /dev/null and b/resources/ui/units/aircrafts/banners/Tu-16.jpg differ
diff --git a/resources/ui/units/aircrafts/banners/Tu-4K.jpg b/resources/ui/units/aircrafts/banners/Tu-4K.jpg
new file mode 100644
index 00000000..b0908ad1
Binary files /dev/null and b/resources/ui/units/aircrafts/banners/Tu-4K.jpg differ
diff --git a/resources/ui/units/aircrafts/banners/tu_22D.jpg b/resources/ui/units/aircrafts/banners/tu_22D.jpg
new file mode 100644
index 00000000..5c26a74d
Binary files /dev/null and b/resources/ui/units/aircrafts/banners/tu_22D.jpg differ
diff --git a/resources/ui/units/aircrafts/banners/tu_22KD.jpg b/resources/ui/units/aircrafts/banners/tu_22KD.jpg
new file mode 100644
index 00000000..1af857e3
Binary files /dev/null and b/resources/ui/units/aircrafts/banners/tu_22KD.jpg differ
diff --git a/resources/ui/units/aircrafts/icons/B_47_24.jpg b/resources/ui/units/aircrafts/icons/B_47_24.jpg
new file mode 100644
index 00000000..0101f96d
Binary files /dev/null and b/resources/ui/units/aircrafts/icons/B_47_24.jpg differ
diff --git a/resources/ui/units/aircrafts/icons/Tu-16_24.jpg b/resources/ui/units/aircrafts/icons/Tu-16_24.jpg
new file mode 100644
index 00000000..4485652d
Binary files /dev/null and b/resources/ui/units/aircrafts/icons/Tu-16_24.jpg differ
diff --git a/resources/ui/units/aircrafts/icons/Tu-4K_24.jpg b/resources/ui/units/aircrafts/icons/Tu-4K_24.jpg
new file mode 100644
index 00000000..b46d92e4
Binary files /dev/null and b/resources/ui/units/aircrafts/icons/Tu-4K_24.jpg differ
diff --git a/resources/ui/units/aircrafts/icons/tu_22D_24.jpg b/resources/ui/units/aircrafts/icons/tu_22D_24.jpg
new file mode 100644
index 00000000..547731ef
Binary files /dev/null and b/resources/ui/units/aircrafts/icons/tu_22D_24.jpg differ
diff --git a/resources/ui/units/aircrafts/icons/tu_22KD_24.jpg b/resources/ui/units/aircrafts/icons/tu_22KD_24.jpg
new file mode 100644
index 00000000..b3af5e78
Binary files /dev/null and b/resources/ui/units/aircrafts/icons/tu_22KD_24.jpg differ
diff --git a/resources/units/aircraft/B_47.yaml b/resources/units/aircraft/B_47.yaml
new file mode 100644
index 00000000..71c17273
--- /dev/null
+++ b/resources/units/aircraft/B_47.yaml
@@ -0,0 +1,20 @@
+description:
+  "The Boeing B-47 Stratojet is an American long-range, six-engined, turbojet-powered
+  strategic bomber designed to fly at high subsonic speed and at high altitude to
+  avoid enemy interceptor aircraft. The primary mission of the B-47 was as a nuclear
+  bomber capable of striking targets within the Soviet Union."
+introduced: 1951
+manufacturer: Boeing
+origin: USA
+price: 30
+role: Strategic Bomber
+max_range: 2000
+variants:
+  B-47 Stratojet: {}
+tasks:
+  Anti-ship: 90
+  DEAD: 200
+  OCA/Runway: 610
+  Strike: 610
+  SEAD: 90
+  SEAD Sweep: 90
\ No newline at end of file
diff --git a/resources/units/aircraft/F-5E-3.yaml b/resources/units/aircraft/F-5E-3.yaml
index f83bc2c2..02095c53 100644
--- a/resources/units/aircraft/F-5E-3.yaml
+++ b/resources/units/aircraft/F-5E-3.yaml
@@ -25,6 +25,14 @@ max_range: 100
 gunfighter: true
 variants:
   F-5E Tiger II: {}
+radios:
+  intra_flight: AN/ARC-164
+  inter_flight: AN/ARC-164
+  channels:
+    type: common
+    namer: single
+    intra_flight_radio_index: 1
+    inter_flight_radio_index: 1
 # default_overrides:
 #   ChaffBurst: 0
 #   ChaffBurstInt: 0
diff --git a/resources/units/aircraft/F-5E-3_FC.yaml b/resources/units/aircraft/F-5E-3_FC.yaml
new file mode 100644
index 00000000..4364fa22
--- /dev/null
+++ b/resources/units/aircraft/F-5E-3_FC.yaml
@@ -0,0 +1,37 @@
+description:
+  "The F-5E was developed by Northrop Corporation in early 1970s. The light\
+  \ tactical fighter is an upgraded version based on previous F-5A developments. The\
+  \ F-5s' combat role encompasses air superiority, ground support, and ground attack.\
+  \ Given its mission flexibility, ease of operation, and low cost, the Tiger II has,\
+  \ and continues to serve, air forces across the globe.\n\nThe F-5\u0415 is armed\
+  \ with two 20-mm \u041C39-\u04103 cannons with 280 rounds per each cannon. The cannons\
+  \ are located in the nose section, forward of the cockpit. Special deflectors are\
+  \ used to avoid compressor stall conditions caused by hot gas ingestion as a bi-product\
+  \ of operating the M-39-A3. Each cannon is capable of firing at a rate of 1500 to\
+  \ 1700 rounds per minute.\n\nEach wingtip incorporates a launcher rail capable of\
+  \ firing AIM-9 infrared-guided missiles.\n\nFive hard points (one centerline pylon\
+  \ and four underwing pylons) allow the aircraft to carry different types of air-to-ground\
+  \ weapons (bombs, cluster munitions, and rockets) 6,400 pounds (about 3000 kg) in\
+  \ total. In addition, illumination ammunition and cargo containers can be attached.\
+  \ To increase flight duration and range, external fuel tanks can be attached to\
+  \ three hard points (a centerline pylon and two inboard pylons). Maneuverability\
+  \ and speed can be maximized in combat by jettisoning all external stores."
+introduced: 1975
+manufacturer: Northrop
+origin: USA
+price: 12
+role: Light Fighter
+max_range: 100
+gunfighter: true
+variants:
+  F-5E Tiger II (FC): {}
+tasks:
+  BAI: 260
+  BARCAP: 200
+  CAS: 260
+  Escort: 200
+  Fighter sweep: 200
+  Intercept: 200
+  OCA/Aircraft: 260
+  Strike: 200
+  TARCAP: 200
diff --git a/resources/units/aircraft/F-86F Sabre.yaml b/resources/units/aircraft/F-86F Sabre.yaml
index ba4a5684..de8ec761 100644
--- a/resources/units/aircraft/F-86F Sabre.yaml	
+++ b/resources/units/aircraft/F-86F Sabre.yaml	
@@ -15,6 +15,13 @@ role: Fighter
 gunfighter: true
 variants:
   F-86F Sabre: {}
+radios:
+  intra_flight: AN/ARC-27
+  inter_flight: AN/ARC-27
+  channels:
+    type: common
+    intra_flight_radio_index: 1
+    inter_flight_radio_index: 1
 tasks:
   BAI: 250
   BARCAP: 150
diff --git a/resources/units/aircraft/F-86F_FC.yaml b/resources/units/aircraft/F-86F_FC.yaml
new file mode 100644
index 00000000..d237c7d3
--- /dev/null
+++ b/resources/units/aircraft/F-86F_FC.yaml
@@ -0,0 +1,34 @@
+always_keeps_gun: true
+description:
+  "The North American F-86F Sabre was the most capable western fighter\
+  \ of the early- to mid-1950s. This swept wing, single engine jet was the most important\
+  \ western aircraft of the Korean War and often tangled with Russian-made MiG-15s\
+  \ over the infamous \u201CMiG Alley\u201D. It was a hard struggle not only for the\
+  \ Korean sky, but also between two excellent aircraft builders of the East and West.\
+  \ In addition to its primary role as an air-to-air fighter, the Sabre could also\
+  \ carry bombs and air-to-ground rockets to attack ground targets."
+introduced: 1953
+manufacturer: North American
+origin: USA
+price: 8
+role: Fighter
+gunfighter: true
+variants:
+  F-86F Sabre (FC): {}
+radios:
+  intra_flight: AN/ARC-27
+  inter_flight: AN/ARC-27
+  channels:
+    type: common
+    intra_flight_radio_index: 1
+    inter_flight_radio_index: 1
+tasks:
+  BAI: 250
+  BARCAP: 150
+  CAS: 250
+  Escort: 150
+  Fighter sweep: 150
+  Intercept: 150
+  OCA/Aircraft: 250
+  Strike: 190
+  TARCAP: 150
diff --git a/resources/units/aircraft/MiG-15bis_FC.yaml b/resources/units/aircraft/MiG-15bis_FC.yaml
new file mode 100644
index 00000000..263c4ced
--- /dev/null
+++ b/resources/units/aircraft/MiG-15bis_FC.yaml
@@ -0,0 +1,31 @@
+always_keeps_gun: true
+description:
+  Developed in the years immediately following World War II, the MiG-15bis
+  was a first-generation jet fighter designed by the Mikoyan-Gurevich design bureau
+  of the Soviet Union. The MiG-15bis is a single engine, swept-wing jet that saw over
+  15,000 copies produced. The MiG-15 gained fame in the skies over Korea where it
+  battled the F-86 Sabre and other allied aircraft. It proved an excellent match to
+  the Sabre, and it often came down to the skill of the pilot that determined who
+  made it home and who was left dangling from a parachute. Having an excellent thrust-to-weight
+  ratio and good climbing characteristics, the MiG-15bis was also armed with two NR-23
+  23mm cannons and a single, powerful N-37 37mm cannon. Not surprisingly, it is considered
+  by many as one of the deadliest fighters of the era.
+introduced: 1950
+manufacturer: Mikoyan-Gurevich
+origin: USSR/Russia
+price: 8
+role: Fighter
+gunfighter: true
+variants:
+  MiG-15bis Fagot (FC): {}
+kneeboard_units: "metric"
+tasks:
+  BAI: 360
+  BARCAP: 140
+  CAS: 360
+  Escort: 140
+  Fighter sweep: 140
+  Intercept: 140
+  OCA/Aircraft: 360
+  Strike: 210
+  TARCAP: 140
diff --git a/resources/units/aircraft/Tu-16.yaml b/resources/units/aircraft/Tu-16.yaml
new file mode 100644
index 00000000..a4011ba8
--- /dev/null
+++ b/resources/units/aircraft/Tu-16.yaml
@@ -0,0 +1,23 @@
+description:
+  "The Tupolev Tu-16 (NATO reporting name: Badger) is a twin-engined
+  jet strategic heavy bomber used by the Soviet Union.
+  It has the capability to carry KS-1, KSR-2 and KSR-5 missiles.
+  This aircraft is part of the Cold War assets mod by tripod3."
+introduced: 1954
+manufacturer: Tupolev
+origin: USSR
+price: 40
+role: Strategic bomber
+max_range: 2000
+variants:
+  Tu-16 Badger-B: {}
+# default_overrides:
+#   Belly_Bay_Door: false
+tasks:
+  Anti-ship: 150
+  BAI: 370
+  CAS: 370
+  DEAD: 170
+  OCA/Aircraft: 370
+  OCA/Runway: 630
+  Strike: 640
diff --git a/resources/units/aircraft/Tu-4K.yaml b/resources/units/aircraft/Tu-4K.yaml
new file mode 100644
index 00000000..f7bbae62
--- /dev/null
+++ b/resources/units/aircraft/Tu-4K.yaml
@@ -0,0 +1,16 @@
+description:
+  "The Tupolev Tu-4 (NATO reporting name: Bull) is a piston-engined
+  Soviet strategic bomber that served the Soviet Air Force from the
+  late 1940s to mid-1960s. It is a reverse-engineered copy of the
+  American B-29 Superfortress."
+introduced: 1949
+manufacturer: Tupolev/Boeing
+origin: USSR/USA
+price: 20
+role: Heavy Bomber
+variants:
+  Tu-4K Bull: {}
+tasks:
+  OCA/Runway: 200
+  Strike: 200
+  Anti-ship: 200
\ No newline at end of file
diff --git a/resources/units/aircraft/tu_22D.yaml b/resources/units/aircraft/tu_22D.yaml
new file mode 100644
index 00000000..0f3a5e1d
--- /dev/null
+++ b/resources/units/aircraft/tu_22D.yaml
@@ -0,0 +1,22 @@
+description:
+  "The Tupolev Tu-22 (NATO reporting name: Blinder) was the first
+  supersonic bomber to enter production in the Soviet Union.
+  This is the original free-fall bomber variant.
+  This aircraft is part of the Cold War assets mod by tripod3."
+introduced: 1962
+manufacturer: Tupolev
+origin: USSR
+price: 40
+role: Medium bomber
+variants:
+  Tu-22D Blinder: {}
+# default_overrides:
+#   Belly_Bay_Door: false
+tasks:
+  Anti-ship: 100
+  BAI: 350
+  CAS: 350
+  DEAD: 150
+  OCA/Aircraft: 350
+  OCA/Runway: 600
+  Strike: 600
diff --git a/resources/units/aircraft/tu_22KD.yaml b/resources/units/aircraft/tu_22KD.yaml
new file mode 100644
index 00000000..4c0d6096
--- /dev/null
+++ b/resources/units/aircraft/tu_22KD.yaml
@@ -0,0 +1,25 @@
+description:
+  "The Tupolev Tu-22 (NATO reporting name: Blinder) was the first
+  supersonic bomber to enter production in the Soviet Union.
+  This is the missile-carrier version built from 1965, equipped
+  to launch the Raduga Kh-22 (AS-4 Kitchen) missile.
+  This aircraft is part of the Cold War assets mod by tripod3."
+introduced: 1965
+manufacturer: Tupolev
+origin: USSR
+price: 45
+role: Medium bomber
+variants:
+  Tu-22KD Blinder: {}
+# default_overrides:
+#   Belly_Bay_Door: false
+tasks:
+  Anti-ship: 100
+  BAI: 350
+  CAS: 350
+  DEAD: 150
+  OCA/Aircraft: 350
+  OCA/Runway: 600
+  Strike: 600
+  SEAD: 30
+  SEAD Sweep: 30
\ No newline at end of file
diff --git a/resources/units/ground_units/M1A2C_SEP_V3.yaml b/resources/units/ground_units/M1A2C_SEP_V3.yaml
new file mode 100644
index 00000000..19597a37
--- /dev/null
+++ b/resources/units/ground_units/M1A2C_SEP_V3.yaml
@@ -0,0 +1,9 @@
+class: Tank
+description: 
+introduced: 1992
+manufacturer: General Dynamics Land Systems
+origin: USA
+price: 25
+role: Main Battle Tank
+variants:
+  MBT M1A2C SEP v3 Abrams: {}
diff --git a/resources/units/ground_units/MaxxPro_MRAP.yaml b/resources/units/ground_units/MaxxPro_MRAP.yaml
new file mode 100644
index 00000000..14af8adb
--- /dev/null
+++ b/resources/units/ground_units/MaxxPro_MRAP.yaml
@@ -0,0 +1,9 @@
+class: APC
+description: 2007
+introduced: 
+manufacturer: Navistar/Plasan
+origin: USA
+price: 8
+role: Armoured Personnel Carrier
+variants:
+  APC MRAP MaxxPro: {}
diff --git a/unshipped_data/arcgis_maps/afghanistan/exclusion/exclusion.cpg b/unshipped_data/arcgis_maps/afghanistan/exclusion/exclusion.cpg
new file mode 100644
index 00000000..3ad133c0
--- /dev/null
+++ b/unshipped_data/arcgis_maps/afghanistan/exclusion/exclusion.cpg
@@ -0,0 +1 @@
+UTF-8
\ No newline at end of file
diff --git a/unshipped_data/arcgis_maps/afghanistan/exclusion/exclusion.dbf b/unshipped_data/arcgis_maps/afghanistan/exclusion/exclusion.dbf
new file mode 100644
index 00000000..b7a18b84
Binary files /dev/null and b/unshipped_data/arcgis_maps/afghanistan/exclusion/exclusion.dbf differ
diff --git a/unshipped_data/arcgis_maps/afghanistan/exclusion/exclusion.prj b/unshipped_data/arcgis_maps/afghanistan/exclusion/exclusion.prj
new file mode 100644
index 00000000..b17f93ee
--- /dev/null
+++ b/unshipped_data/arcgis_maps/afghanistan/exclusion/exclusion.prj
@@ -0,0 +1 @@
+PROJCS["WGS_1984_UTM_Zone_41N",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",500000.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",63.0],PARAMETER["Scale_Factor",0.9996],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]]
\ No newline at end of file
diff --git a/unshipped_data/arcgis_maps/afghanistan/exclusion/exclusion.qmd b/unshipped_data/arcgis_maps/afghanistan/exclusion/exclusion.qmd
new file mode 100644
index 00000000..62166f87
--- /dev/null
+++ b/unshipped_data/arcgis_maps/afghanistan/exclusion/exclusion.qmd
@@ -0,0 +1,27 @@
+<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
+<qgis version="3.30.3-'s-Hertogenbosch">
+  <identifier></identifier>
+  <parentidentifier></parentidentifier>
+  <language></language>
+  <type></type>
+  <title></title>
+  <abstract></abstract>
+  <links/>
+  <dates/>
+  <fees></fees>
+  <encoding></encoding>
+  <crs>
+    <spatialrefsys nativeFormat="Wkt">
+      <wkt></wkt>
+      <proj4></proj4>
+      <srsid>0</srsid>
+      <srid>0</srid>
+      <authid></authid>
+      <description></description>
+      <projectionacronym></projectionacronym>
+      <ellipsoidacronym></ellipsoidacronym>
+      <geographicflag>false</geographicflag>
+    </spatialrefsys>
+  </crs>
+  <extent/>
+</qgis>
diff --git a/unshipped_data/arcgis_maps/afghanistan/exclusion/exclusion.shp b/unshipped_data/arcgis_maps/afghanistan/exclusion/exclusion.shp
new file mode 100644
index 00000000..80d40480
Binary files /dev/null and b/unshipped_data/arcgis_maps/afghanistan/exclusion/exclusion.shp differ
diff --git a/unshipped_data/arcgis_maps/afghanistan/exclusion/exclusion.shx b/unshipped_data/arcgis_maps/afghanistan/exclusion/exclusion.shx
new file mode 100644
index 00000000..b5bb2013
Binary files /dev/null and b/unshipped_data/arcgis_maps/afghanistan/exclusion/exclusion.shx differ
diff --git a/unshipped_data/arcgis_maps/afghanistan/land/landmap.cpg b/unshipped_data/arcgis_maps/afghanistan/land/landmap.cpg
new file mode 100644
index 00000000..3ad133c0
--- /dev/null
+++ b/unshipped_data/arcgis_maps/afghanistan/land/landmap.cpg
@@ -0,0 +1 @@
+UTF-8
\ No newline at end of file
diff --git a/unshipped_data/arcgis_maps/afghanistan/land/landmap.dbf b/unshipped_data/arcgis_maps/afghanistan/land/landmap.dbf
new file mode 100644
index 00000000..ec41ebae
Binary files /dev/null and b/unshipped_data/arcgis_maps/afghanistan/land/landmap.dbf differ
diff --git a/unshipped_data/arcgis_maps/afghanistan/land/landmap.prj b/unshipped_data/arcgis_maps/afghanistan/land/landmap.prj
new file mode 100644
index 00000000..b17f93ee
--- /dev/null
+++ b/unshipped_data/arcgis_maps/afghanistan/land/landmap.prj
@@ -0,0 +1 @@
+PROJCS["WGS_1984_UTM_Zone_41N",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",500000.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",63.0],PARAMETER["Scale_Factor",0.9996],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]]
\ No newline at end of file
diff --git a/unshipped_data/arcgis_maps/afghanistan/land/landmap.qmd b/unshipped_data/arcgis_maps/afghanistan/land/landmap.qmd
new file mode 100644
index 00000000..fac0c437
--- /dev/null
+++ b/unshipped_data/arcgis_maps/afghanistan/land/landmap.qmd
@@ -0,0 +1,44 @@
+<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
+<qgis version="3.30.3-'s-Hertogenbosch">
+  <identifier></identifier>
+  <parentidentifier></parentidentifier>
+  <language></language>
+  <type></type>
+  <title></title>
+  <abstract></abstract>
+  <contact>
+    <name></name>
+    <organization></organization>
+    <position></position>
+    <voice></voice>
+    <fax></fax>
+    <email></email>
+    <role></role>
+  </contact>
+  <links/>
+  <dates/>
+  <fees></fees>
+  <encoding></encoding>
+  <crs>
+    <spatialrefsys nativeFormat="Wkt">
+      <wkt>PROJCRS["WGS 84 / UTM zone 41N",BASEGEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],ID["EPSG",4326]],CONVERSION["UTM zone 41N",METHOD["Transverse Mercator",ID["EPSG",9807]],PARAMETER["Latitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8801]],PARAMETER["Longitude of natural origin",63,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8802]],PARAMETER["Scale factor at natural origin",0.9996,SCALEUNIT["unity",1],ID["EPSG",8805]],PARAMETER["False easting",500000,LENGTHUNIT["metre",1],ID["EPSG",8806]],PARAMETER["False northing",0,LENGTHUNIT["metre",1],ID["EPSG",8807]]],CS[Cartesian,2],AXIS["(E)",east,ORDER[1],LENGTHUNIT["metre",1]],AXIS["(N)",north,ORDER[2],LENGTHUNIT["metre",1]],USAGE[SCOPE["Navigation and medium accuracy spatial referencing."],AREA["Between 60°E and 66°E, northern hemisphere between equator and 84°N, onshore and offshore. Afghanistan. Islamic Republic of Iran. kazakhstan. Pakistan. Russian Federation. Turkmenistan. Uzbekistan."],BBOX[0,60,84,66]],ID["EPSG",32641]]</wkt>
+      <proj4>+proj=utm +zone=41 +datum=WGS84 +units=m +no_defs</proj4>
+      <srsid>3125</srsid>
+      <srid>32641</srid>
+      <authid>EPSG:32641</authid>
+      <description>WGS 84 / UTM zone 41N</description>
+      <projectionacronym>utm</projectionacronym>
+      <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+      <geographicflag>false</geographicflag>
+    </spatialrefsys>
+  </crs>
+  <extent>
+    <spatial maxy="0" minx="0" dimensions="2" maxx="0" miny="0" minz="0" maxz="0" crs="EPSG:32641"/>
+    <temporal>
+      <period>
+        <start></start>
+        <end></end>
+      </period>
+    </temporal>
+  </extent>
+</qgis>
diff --git a/unshipped_data/arcgis_maps/afghanistan/land/landmap.shp b/unshipped_data/arcgis_maps/afghanistan/land/landmap.shp
new file mode 100644
index 00000000..326a330d
Binary files /dev/null and b/unshipped_data/arcgis_maps/afghanistan/land/landmap.shp differ
diff --git a/unshipped_data/arcgis_maps/afghanistan/land/landmap.shx b/unshipped_data/arcgis_maps/afghanistan/land/landmap.shx
new file mode 100644
index 00000000..e2d5986d
Binary files /dev/null and b/unshipped_data/arcgis_maps/afghanistan/land/landmap.shx differ
diff --git a/unshipped_data/arcgis_maps/afghanistan/sea/sea_zones.cpg b/unshipped_data/arcgis_maps/afghanistan/sea/sea_zones.cpg
new file mode 100644
index 00000000..3ad133c0
--- /dev/null
+++ b/unshipped_data/arcgis_maps/afghanistan/sea/sea_zones.cpg
@@ -0,0 +1 @@
+UTF-8
\ No newline at end of file
diff --git a/unshipped_data/arcgis_maps/afghanistan/sea/sea_zones.dbf b/unshipped_data/arcgis_maps/afghanistan/sea/sea_zones.dbf
new file mode 100644
index 00000000..e66affdd
Binary files /dev/null and b/unshipped_data/arcgis_maps/afghanistan/sea/sea_zones.dbf differ
diff --git a/unshipped_data/arcgis_maps/afghanistan/sea/sea_zones.prj b/unshipped_data/arcgis_maps/afghanistan/sea/sea_zones.prj
new file mode 100644
index 00000000..b17f93ee
--- /dev/null
+++ b/unshipped_data/arcgis_maps/afghanistan/sea/sea_zones.prj
@@ -0,0 +1 @@
+PROJCS["WGS_1984_UTM_Zone_41N",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",500000.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",63.0],PARAMETER["Scale_Factor",0.9996],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]]
\ No newline at end of file
diff --git a/unshipped_data/arcgis_maps/afghanistan/sea/sea_zones.shp b/unshipped_data/arcgis_maps/afghanistan/sea/sea_zones.shp
new file mode 100644
index 00000000..3d95e38a
Binary files /dev/null and b/unshipped_data/arcgis_maps/afghanistan/sea/sea_zones.shp differ
diff --git a/unshipped_data/arcgis_maps/afghanistan/sea/sea_zones.shx b/unshipped_data/arcgis_maps/afghanistan/sea/sea_zones.shx
new file mode 100644
index 00000000..3d95e38a
Binary files /dev/null and b/unshipped_data/arcgis_maps/afghanistan/sea/sea_zones.shx differ