diff --git a/changelog.md b/changelog.md
index a2d662bd..0611e976 100644
--- a/changelog.md
+++ b/changelog.md
@@ -15,7 +15,7 @@
 * **[Modding]** Update SU-30 mod to v2.8.03 Beta + CWS 3.70
 * **[Plugins]** EW Script - DEAD added to applicable flight types.
 * **[Plugins]** EW Script - Offensive Jamming restricted to aircraft with ALQ99/249 pods, or "has_built_in_jamming: true" in aircarft yaml (AI and Player)
-
+* **[Modding]** Update to CJS Super Hornet Mod v2.4.4
 
 ## Fixes
 * **[Flight Plans]** Fixed a bug when a package was created with only escort flights
diff --git a/pydcs_extensions/fa18efg/fa18efg.py b/pydcs_extensions/fa18efg/fa18efg.py
index 60fb2f4b..08ad37b5 100644
--- a/pydcs_extensions/fa18efg/fa18efg.py
+++ b/pydcs_extensions/fa18efg/fa18efg.py
@@ -15,6 +15,11 @@ class WeaponsFA18EF:
         "name": " [ STA 01	  | WNGTP | LAU127 ] - 1x AIM-9M Sidewinder IR AAM",
         "weight": 85.72,
     }
+    STA_01_WNGTP_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_01_SW_MOD_1X_AIM-9X2}",
+        "name": " [ STA 01	  | WNGTP | LAU127 ] - 1x AIM-9X-2+ Sidewinder IR AAM, (Modern Missiles Mod Required)",
+        "weight": 84.46,
+    }
     STA_01_WNGTP_LAU127_1x_AIM_9X_Sidewinder_IR_AAM = {
         "clsid": "{SUPERHORNET_PYLON_01_SW_1X_AIM-9X}",
         "name": " [ STA 01	  | WNGTP | LAU127 ] - 1x AIM-9X Sidewinder IR AAM",
@@ -160,9 +165,14 @@ class WeaponsFA18EF:
         "name": " [ STA 02	  | SUU80 | LAU127 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 213.58,
     }
-    STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_02_AM_MOD_1X_AIM-120}",
+        "name": " [ STA 02	  | SUU80 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM (Modern Missiles Mod Required)",
+        "weight": 209.95,
+    }
+    STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = {
         "clsid": "{SUPERHORNET_PYLON_02_AM_1X_AIM-120D}",
-        "name": " [ STA 02	  | SUU80 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 02	  | SUU80 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 214.5,
     }
     STA_02_SUU80_LAU127_1x_AIM_9M_Sidewinder_IR_AAM = {
@@ -170,6 +180,11 @@ class WeaponsFA18EF:
         "name": " [ STA 02	  | SUU80 | LAU127 ] - 1x AIM-9M Sidewinder IR AAM",
         "weight": 137.82,
     }
+    STA_02_SUU80_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_02_SW_MOD_1X_AIM-9X2}",
+        "name": " [ STA 02	  | SUU80 | LAU127 ] - 1x AIM-9X-2+ Sidewinder IR AAM, (Modern Missiles Mod Required)",
+        "weight": 136.56,
+    }
     STA_02_SUU80_LAU127_1x_AIM_9X_Sidewinder_IR_AAM = {
         "clsid": "{SUPERHORNET_PYLON_02_SW_1X_AIM-9X}",
         "name": " [ STA 02	  | SUU80 | LAU127 ] - 1x AIM-9X Sidewinder IR AAM",
@@ -190,29 +205,39 @@ class WeaponsFA18EF:
         "name": " [ STA 02	  | SUU80 | LAU127 ] - 1x Marvin LAU-127 Rail Launcher for AIM-120B/C/D and AIM9L/M/X",
         "weight": 52.1,
     }
-    STA_02_03_79_80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM = {
+    STA_02_03_79___80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM = {
         "clsid": "{SUPERHORNET_PYLON_02_MB_OB_AM_2X_AIM-120}",
-        "name": " [ STA 02/03 | 79/80 | LAU127 ] - 1x/1x AIM-120B AMRAAM - Active Radar AAM",
+        "name": " [ STA 02/03 | 79 / 80 | LAU127 ] - 1x/1x AIM-120B AMRAAM - Active Radar AAM",
         "weight": 547.3,
     }
-    STA_02_03_79_80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM = {
+    STA_02_03_79___80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM = {
         "clsid": "{SUPERHORNET_PYLON_02_MB_OB_AM_2X_AIM-120C}",
-        "name": " [ STA 02/03 | 79/80 | LAU127 ] - 1x/1x AIM-120C AMRAAM - Active Radar AAM",
+        "name": " [ STA 02/03 | 79 / 80 | LAU127 ] - 1x/1x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 554.56,
     }
-    STA_02_03_79_80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_02_03_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_02_MB_OB_AM_MOD_2X_AIM-120}",
+        "name": " [ STA 02/03 | 79 / 80 | LAU127 ] - 1x/1x AIM-120D AMRAAM - Active Radar AAM (Modern Missiles Mod Required)",
+        "weight": 547.3,
+    }
+    STA_02_03_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = {
         "clsid": "{SUPERHORNET_PYLON_02_MB_OB_AM_2X_AIM-120D}",
-        "name": " [ STA 02/03 | 79/80 | LAU127 ] - 1x/1x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 02/03 | 79 / 80 | LAU127 ] - 1x/1x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 556.4,
     }
-    STA_02_03_79_80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM = {
+    STA_02_03_79___80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM = {
         "clsid": "{SUPERHORNET_PYLON_02_MB_OB_SW_2X_AIM-9}",
-        "name": " [ STA 02/03 | 79/80 | LAU127 ] - 1x/1x AIM-9M Sidewinder IR AAM",
+        "name": " [ STA 02/03 | 79 / 80 | LAU127 ] - 1x/1x AIM-9M Sidewinder IR AAM",
         "weight": 403.04,
     }
-    STA_02_03_79_80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM = {
+    STA_02_03_79___80_LAU127_1x_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_02_MB_OB_SW_MOD_2X_AIM-9X2}",
+        "name": " [ STA 02/03 | 79 / 80 | LAU127 ] - 1x/1x AIM-9X-2+ Sidewinder IR AAM, (Modern Missiles Mod Required)",
+        "weight": 400.52,
+    }
+    STA_02_03_79___80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM = {
         "clsid": "{SUPERHORNET_PYLON_02_MB_OB_SW_2X_AIM-9X}",
-        "name": " [ STA 02/03 | 79/80 | LAU127 ] - 1x/1x AIM-9X Sidewinder IR AAM",
+        "name": " [ STA 02/03 | 79 / 80 | LAU127 ] - 1x/1x AIM-9X Sidewinder IR AAM",
         "weight": 400.52,
     }
     STA_03_SUU79_BRU32_1x_AGM_154A___JSOW_CEB__CBU_type_ = {
@@ -235,10 +260,20 @@ class WeaponsFA18EF:
         "name": " [ STA 03	  | SUU79 | BRU32   ] - 1x AGM-84E Harpoon/SLAM (Stand-Off Land-Attack Missile)",
         "weight": 662.47,
     }
+    STA_03_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_ = {
+        "clsid": "{SUPERHORNET_PYLON_03_IB_AM_174_1X_AIM-120_AI}",
+        "name": " [ STA 03	  | SUU79 | BRU32   ] - 1x AIM-174B Gunslinger - Active Radar AAM, (AI Only)",
+        "weight": 195.95,
+    }
+    STA_03_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_03_IB_AM_174_1X_AIM-120}",
+        "name": " [ STA 03	  | SUU79 | BRU32   ] - 1x AIM-174B Gunslinger - Active Radar AAM, (Current Hill's AIM-174B Mod Required)",
+        "weight": 195.95,
+    }
     STA_03_SUU79_BRU32_1x_ALQ_167_Countermeasures_System = {
         "clsid": "{SUPERHORNET_PYLON_03_MB_PD_1X_ALQ-167}",
         "name": " [ STA 03	  | SUU79 | BRU32   ] - 1x ALQ-167 Countermeasures System",
-        "weight": 84.47,
+        "weight": 141.518,
     }
     STA_03_SUU79_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod = {
         "clsid": "{SUPERHORNET_PYLON_03_MB_PD_1X_AWW-13}",
@@ -260,15 +295,20 @@ class WeaponsFA18EF:
         "name": " [ STA 03	  | SUU79 | BRU32   ] - 1x CBU-99 - 490lbs, 247 x HEAT Bomblets",
         "weight": 56.47,
     }
-    STA_03_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = {
+    STA_03_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = {
         "clsid": "{SUPERHORNET_PYLON_03_MB_FT_FPU-12_Fueltank}",
-        "name": " [ STA 03	  | SUU79 | BRU32   ] - 1x FPU-12/A Fuel Tank",
-        "weight": 1384.47,
+        "name": " [ STA 03	  | SUU79 | BRU32   ] - 1x FPU-12/A (480 GAL) Fuel Tank",
+        "weight": 1656.97,
     }
-    STA_03_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = {
+    STA_03_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = {
         "clsid": "{SUPERHORNET_PYLON_03_MB_FT_FPU-12_FueltankHighVis}",
-        "name": " [ STA 03	  | SUU79 | BRU32   ] - 1x FPU-12/A Fuel Tank - High Vis",
-        "weight": 1384.47,
+        "name": " [ STA 03	  | SUU79 | BRU32   ] - 1x FPU-12/A (480 GAL) Fuel Tank - High Vis",
+        "weight": 1656.97,
+    }
+    STA_03_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = {
+        "clsid": "{SUPERHORNET_PYLON_03_MB_FT_FPU-8A}",
+        "name": " [ STA 03	  | SUU79 | BRU32   ] - 1x FPU-8/A (330 GAL) Fuel Tank",
+        "weight": 1184.47,
     }
     STA_03_SUU79_BRU32_1x_GBU_10___2000lb_Laser_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_02_MB_MK_1X_GBU-10}",
@@ -675,14 +715,24 @@ class WeaponsFA18EF:
         "name": " [ STA 03	  | SUU79 | LAU127 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 340.98,
     }
-    STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_02_MB_AM_MOD_1X_AIM-120}",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM (Modern Missiles Mod Required)",
+        "weight": 337.35,
+    }
+    STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__ = {
+        "clsid": "{SUPERHORNET_PYLON_03_MB_AM_MOD_1X_AIM-120}",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM (Modern Missiles Mod Required)",
+        "weight": 337.35,
+    }
+    STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = {
         "clsid": "{SUPERHORNET_PYLON_02_MB_AM_1X_AIM-120D}",
-        "name": " [ STA 03	  | SUU79 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 341.9,
     }
-    STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__ = {
+    STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = {
         "clsid": "{SUPERHORNET_PYLON_03_MB_AM_1X_AIM-120D}",
-        "name": " [ STA 03	  | SUU79 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 341.9,
     }
     STA_03_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM = {
@@ -695,6 +745,16 @@ class WeaponsFA18EF:
         "name": " [ STA 03	  | SUU79 | LAU127 ] - 1x AIM-9M Sidewinder IR AAM",
         "weight": 265.22,
     }
+    STA_03_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_02_MB_SW_MOD_1X_AIM-9X2}",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 1x AIM-9X-2+ Sidewinder IR AAM, (Modern Missiles Mod Required)",
+        "weight": 263.96,
+    }
+    STA_03_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__ = {
+        "clsid": "{SUPERHORNET_PYLON_03_MB_SW_MOD_1X_AIM-9X2}",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 1x AIM-9X-2+ Sidewinder IR AAM, (Modern Missiles Mod Required)",
+        "weight": 263.96,
+    }
     STA_03_SUU79_LAU127_1x_AIM_9X_Sidewinder_IR_AAM = {
         "clsid": "{SUPERHORNET_PYLON_02_MB_SW_1X_AIM-9X}",
         "name": " [ STA 03	  | SUU79 | LAU127 ] - 1x AIM-9X Sidewinder IR AAM",
@@ -735,14 +795,24 @@ class WeaponsFA18EF:
         "name": " [ STA 03	  | SUU79 | LAU127 ] - 2x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 502.46,
     }
-    STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_02_MB_AM_MOD_2X_AIM-120}",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 2x AIM-120D AMRAAM - Active Radar AAM (Modern Missiles Mod Required)",
+        "weight": 495.2,
+    }
+    STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__ = {
+        "clsid": "{SUPERHORNET_PYLON_03_MB_AM_MOD_2X_AIM-120}",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 2x AIM-120D AMRAAM - Active Radar AAM (Modern Missiles Mod Required)",
+        "weight": 495.2,
+    }
+    STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = {
         "clsid": "{SUPERHORNET_PYLON_02_MB_AM_2X_AIM-120D}",
-        "name": " [ STA 03	  | SUU79 | LAU127 ] - 2x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 2x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 504.3,
     }
-    STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__ = {
+    STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = {
         "clsid": "{SUPERHORNET_PYLON_03_MB_AM_2X_AIM-120D}",
-        "name": " [ STA 03	  | SUU79 | LAU127 ] - 2x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 2x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 504.3,
     }
     STA_03_SUU79_LAU127_2x_AIM_9M_Sidewinder_IR_AAM = {
@@ -755,6 +825,16 @@ class WeaponsFA18EF:
         "name": " [ STA 03	  | SUU79 | LAU127 ] - 2x AIM-9M Sidewinder IR AAM",
         "weight": 350.94,
     }
+    STA_03_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_02_MB_SW_MOD_2X_AIM-9X2}",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 2x AIM-9X-2+ Sidewinder IR AAM, (Modern Missiles Mod Required)",
+        "weight": 348.42,
+    }
+    STA_03_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__ = {
+        "clsid": "{SUPERHORNET_PYLON_03_MB_SW_MOD_2X_AIM-9X2}",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 2x AIM-9X-2+ Sidewinder IR AAM, (Modern Missiles Mod Required)",
+        "weight": 348.42,
+    }
     STA_03_SUU79_LAU127_2x_AIM_9X_Sidewinder_IR_AAM = {
         "clsid": "{SUPERHORNET_PYLON_02_MB_SW_2X_AIM-9X}",
         "name": " [ STA 03	  | SUU79 | LAU127 ] - 2x AIM-9X Sidewinder IR AAM",
@@ -775,71 +855,81 @@ class WeaponsFA18EF:
         "name": " [ STA 03	  | SUU79 | LAU127 ] - 2x Captive AIM-9M for ACM",
         "weight": 350.96,
     }
-    STA_03_02_79_80_BRU32_2x_GBU_10___2000lb_Laser_Guided_Bomb = {
+    STA_03_02_79___80_BRU32_2x_GBU_10___2000lb_Laser_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_MB_MK_2X_GBU-10}",
-        "name": " [ STA 03/02 | 79/80 | BRU32   ] - 2x GBU-10 - 2000lb Laser Guided Bomb",
+        "name": " [ STA 03/02 | 79 / 80 | BRU32   ] - 2x GBU-10 - 2000lb Laser Guided Bomb",
         "weight": 1892.94,
     }
-    STA_03_02_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = {
+    STA_03_02_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_MB_MK_2X_GBU-12}",
-        "name": " [ STA 03/02 | 79/80 | BRU32   ] - 2x GBU-12 - 500lb Laser Guided Bomb",
+        "name": " [ STA 03/02 | 79 / 80 | BRU32   ] - 2x GBU-12 - 500lb Laser Guided Bomb",
         "weight": 622.94,
     }
-    STA_03_02_79_80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb = {
+    STA_03_02_79___80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_MB_MK_2X_GBU-16}",
-        "name": " [ STA 03/02 | 79/80 | BRU32   ] - 2x GBU-16 - 1000lb Laser Guided Bomb",
+        "name": " [ STA 03/02 | 79 / 80 | BRU32   ] - 2x GBU-16 - 1000lb Laser Guided Bomb",
         "weight": 1094.94,
     }
-    STA_03_02_79_80_BRU32_2x_GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = {
+    STA_03_02_79___80_BRU32_2x_GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_MB_MK_2X_GBU-24}",
-        "name": " [ STA 03/02 | 79/80 | BRU32   ] - 2x GBU-24A/B Paveway III - 2000lb Laser Guided Bomb",
+        "name": " [ STA 03/02 | 79 / 80 | BRU32   ] - 2x GBU-24A/B Paveway III - 2000lb Laser Guided Bomb",
         "weight": 1936.94,
     }
-    STA_03_02_79_80_BRU32_2x_GBU_31_V_1_B___JDAM__2000lb_GPS_Guided_Bomb = {
+    STA_03_02_79___80_BRU32_2x_GBU_31_V_1_B___JDAM__2000lb_GPS_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_MB_MK_2X_GBU-31}",
-        "name": " [ STA 03/02 | 79/80 | BRU32   ] - 2x GBU-31(V)1/B - JDAM, 2000lb GPS Guided Bomb",
+        "name": " [ STA 03/02 | 79 / 80 | BRU32   ] - 2x GBU-31(V)1/B - JDAM, 2000lb GPS Guided Bomb",
         "weight": 1936.94,
     }
-    STA_03_02_79_80_BRU32_2x_GBU_31_V_3_B___JDAM__2000lb_GPS_Guided_Bomb = {
+    STA_03_02_79___80_BRU32_2x_GBU_31_V_3_B___JDAM__2000lb_GPS_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_MB_MK_2X_GBU-31V}",
-        "name": " [ STA 03/02 | 79/80 | BRU32   ] - 2x GBU-31(V)3/B - JDAM, 2000lb GPS Guided Bomb",
+        "name": " [ STA 03/02 | 79 / 80 | BRU32   ] - 2x GBU-31(V)3/B - JDAM, 2000lb GPS Guided Bomb",
         "weight": 2030.94,
     }
-    STA_03_02_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = {
+    STA_03_02_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_MB_MK_2X_GBU-38}",
-        "name": " [ STA 03/02 | 79/80 | BRU32   ] - 2x GBU-38 - JDAM, 500lb GPS Guided Bomb",
+        "name": " [ STA 03/02 | 79 / 80 | BRU32   ] - 2x GBU-38 - JDAM, 500lb GPS Guided Bomb",
         "weight": 550.94,
     }
-    STA_03_02_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = {
+    STA_03_02_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_MB_MK_2X_ROCKEYE}",
-        "name": " [ STA 03/02 | 79/80 | BRU32   ] - 2x Mk-20 Rockeye - 490lbs CBU, 247 x HEAT Bomblets",
+        "name": " [ STA 03/02 | 79 / 80 | BRU32   ] - 2x Mk-20 Rockeye - 490lbs CBU, 247 x HEAT Bomblets",
         "weight": 512.94,
     }
-    STA_03_02_79_80_BRU32_2x_Mk_82Y___500lb_GP_Chute_Retarded_HD = {
+    STA_03_02_79___80_BRU32_2x_Mk_82Y___500lb_GP_Chute_Retarded_HD = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_MB_MK_2X_MK-82Y}",
-        "name": " [ STA 03/02 | 79/80 | BRU32   ] - 2x Mk-82Y - 500lb GP Chute Retarded HD",
+        "name": " [ STA 03/02 | 79 / 80 | BRU32   ] - 2x Mk-82Y - 500lb GP Chute Retarded HD",
         "weight": 532.94,
     }
-    STA_03_02_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = {
+    STA_03_02_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_MB_MK_2X_MK-82_Snakeye}",
-        "name": " [ STA 03/02 | 79/80 | BRU32   ] - 2x Mk-82 Snakeye - 500lb GP Bomb HD",
+        "name": " [ STA 03/02 | 79 / 80 | BRU32   ] - 2x Mk-82 Snakeye - 500lb GP Bomb HD",
         "weight": 567.94,
     }
-    STA_03_02_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = {
+    STA_03_02_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_MB_MK_2X_MK-82}",
-        "name": " [ STA 03/02 | 79/80 | BRU32   ] - 2x Mk-82 - 500lb GP Bomb LD",
+        "name": " [ STA 03/02 | 79 / 80 | BRU32   ] - 2x Mk-82 - 500lb GP Bomb LD",
         "weight": 524.94,
     }
-    STA_03_02_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = {
+    STA_03_02_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_MB_MK_2X_MK-83}",
-        "name": " [ STA 03/02 | 79/80 | BRU32   ] - 2x Mk-83 - 1000lb GP Bomb LD",
+        "name": " [ STA 03/02 | 79 / 80 | BRU32   ] - 2x Mk-83 - 1000lb GP Bomb LD",
         "weight": 976.94,
     }
-    STA_03_02_79_80_BRU32_2x_Mk_84___2000lb_GP_Bomb_LD = {
+    STA_03_02_79___80_BRU32_2x_Mk_84___2000lb_GP_Bomb_LD = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_MB_MK_2X_MK-84}",
-        "name": " [ STA 03/02 | 79/80 | BRU32   ] - 2x Mk-84 - 2000lb GP Bomb LD",
+        "name": " [ STA 03/02 | 79 / 80 | BRU32   ] - 2x Mk-84 - 2000lb GP Bomb LD",
         "weight": 1892.94,
     }
+    STA_03_04_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_ = {
+        "clsid": "{SUPERHORNET_PYLON_03_IB_AM_174_2X_AIM-120_AI}",
+        "name": " [ STA 03/04 | SUU79 | BRU32   ] - 2x AIM-174B Gunslinger - Active Radar AAM, (AI Only)",
+        "weight": 391.9,
+    }
+    STA_03_04_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_03_IB_AM_174_2X_AIM-120}",
+        "name": " [ STA 03/04 | SUU79 | BRU32   ] - 2x AIM-174B Gunslinger - Active Radar AAM, (Current Hill's AIM-174B Mod Required)",
+        "weight": 391.9,
+    }
     STA_04_SUU79_BRU32_Remove_SUU_79A_A_Pylon = {
         "clsid": "{SUPERHORNET_PYLON_04_REMOVE_SUU79}",
         "name": " [ STA 04	  | SUU79 | BRU32   ] Remove SUU-79A/A Pylon",
@@ -875,25 +965,35 @@ class WeaponsFA18EF:
         "name": " [ STA 04	  | SUU79 | BRU32   ] - 1x AN/AWW-13 Advanced Datalink Pod",
         "weight": 234.47,
     }
-    STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = {
+    STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = {
         "clsid": "{SUPERHORNET_PYLON_03_IB_FT_FPU-12_Fueltank}",
-        "name": " [ STA 04	  | SUU79 | BRU32   ] - 1x FPU-12/A Fuel Tank",
-        "weight": 1384.47,
+        "name": " [ STA 04	  | SUU79 | BRU32   ] - 1x FPU-12/A (480 GAL) Fuel Tank",
+        "weight": 1656.97,
     }
-    STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank_ = {
+    STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_ = {
         "clsid": "{SUPERHORNET_PYLON_04_IB_FT_FPU-12_Fueltank}",
-        "name": " [ STA 04	  | SUU79 | BRU32   ] - 1x FPU-12/A Fuel Tank",
-        "weight": 1384.47,
+        "name": " [ STA 04	  | SUU79 | BRU32   ] - 1x FPU-12/A (480 GAL) Fuel Tank",
+        "weight": 1656.97,
     }
-    STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = {
+    STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = {
         "clsid": "{SUPERHORNET_PYLON_03_IB_FT_FPU-12_FueltankHighVis}",
-        "name": " [ STA 04	  | SUU79 | BRU32   ] - 1x FPU-12/A Fuel Tank - High Vis",
-        "weight": 1384.47,
+        "name": " [ STA 04	  | SUU79 | BRU32   ] - 1x FPU-12/A (480 GAL) Fuel Tank - High Vis",
+        "weight": 1656.97,
     }
-    STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis_ = {
+    STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis_ = {
         "clsid": "{SUPERHORNET_PYLON_04_IB_FT_FPU-12_FueltankHighVis}",
-        "name": " [ STA 04	  | SUU79 | BRU32   ] - 1x FPU-12/A Fuel Tank - High Vis",
-        "weight": 1384.47,
+        "name": " [ STA 04	  | SUU79 | BRU32   ] - 1x FPU-12/A (480 GAL) Fuel Tank - High Vis",
+        "weight": 1656.97,
+    }
+    STA_04_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = {
+        "clsid": "{SUPERHORNET_PYLON_03_IB_FT_FPU-8A}",
+        "name": " [ STA 04	  | SUU79 | BRU32   ] - 1x FPU-8/A (330 GAL) Fuel Tank",
+        "weight": 1184.47,
+    }
+    STA_04_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank_ = {
+        "clsid": "{SUPERHORNET_PYLON_04_IB_FT_FPU-8A}",
+        "name": " [ STA 04	  | SUU79 | BRU32   ] - 1x FPU-8/A (330 GAL) Fuel Tank",
+        "weight": 1184.47,
     }
     STA_04_SUU79_BRU33_2x_BDU_45B___500lb_Practice_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_03_IB_MK_BR2_BDU-45B}",
@@ -1010,9 +1110,14 @@ class WeaponsFA18EF:
         "name": " [ STA 04	  | SUU79 | LAU127 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 340.98,
     }
-    STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_03_IB_AM_MOD_1X_AIM-120}",
+        "name": " [ STA 04	  | SUU79 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM (Modern Missiles Mod Required)",
+        "weight": 337.35,
+    }
+    STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = {
         "clsid": "{SUPERHORNET_PYLON_03_IB_AM_1X_AIM-120D}",
-        "name": " [ STA 04	  | SUU79 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 04	  | SUU79 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 341.9,
     }
     STA_04_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM = {
@@ -1020,6 +1125,11 @@ class WeaponsFA18EF:
         "name": " [ STA 04	  | SUU79 | LAU127 ] - 1x AIM-9M Sidewinder IR AAM",
         "weight": 265.22,
     }
+    STA_04_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_03_IB_SW_MOD_1X_AIM-9X2}",
+        "name": " [ STA 04	  | SUU79 | LAU127 ] - 1x AIM-9X-2+ Sidewinder IR AAM, (Modern Missiles Mod Required)",
+        "weight": 263.96,
+    }
     STA_04_SUU79_LAU127_1x_AIM_9X_Sidewinder_IR_AAM = {
         "clsid": "{SUPERHORNET_PYLON_03_IB_SW_1X_AIM-9X}",
         "name": " [ STA 04	  | SUU79 | LAU127 ] - 1x AIM-9X Sidewinder IR AAM",
@@ -1045,9 +1155,14 @@ class WeaponsFA18EF:
         "name": " [ STA 04	  | SUU79 | LAU127 ] - 2x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 502.46,
     }
-    STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_03_IB_AM_MOD_2X_AIM-120}",
+        "name": " [ STA 04	  | SUU79 | LAU127 ] - 2x AIM-120D AMRAAM - Active Radar AAM (Modern Missiles Mod Required)",
+        "weight": 495.2,
+    }
+    STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = {
         "clsid": "{SUPERHORNET_PYLON_03_IB_AM_2X_AIM-120D}",
-        "name": " [ STA 04	  | SUU79 | LAU127 ] - 2x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 04	  | SUU79 | LAU127 ] - 2x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 504.3,
     }
     STA_04_SUU79_LAU127_2x_AIM_9M_Sidewinder_IR_AAM = {
@@ -1055,6 +1170,11 @@ class WeaponsFA18EF:
         "name": " [ STA 04	  | SUU79 | LAU127 ] - 2x AIM-9M Sidewinder IR AAM",
         "weight": 350.94,
     }
+    STA_04_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_03_IB_SW_MOD_2X_AIM-9X2}",
+        "name": " [ STA 04	  | SUU79 | LAU127 ] - 2x AIM-9X-2+ Sidewinder IR AAM, (Modern Missiles Mod Required)",
+        "weight": 348.42,
+    }
     STA_04_SUU79_LAU127_2x_AIM_9X_Sidewinder_IR_AAM = {
         "clsid": "{SUPERHORNET_PYLON_03_IB_SW_2X_AIM-9X}",
         "name": " [ STA 04	  | SUU79 | LAU127 ] - 2x AIM-9X Sidewinder IR AAM",
@@ -1160,74 +1280,74 @@ class WeaponsFA18EF:
         "name": " [ STA 04	  | SUU80 | BRU32   ] - 1x Mk-84 - 2000lb GP Bomb LD",
         "weight": 946.47,
     }
-    STA_04_02_79_80_BRU32_2x_GBU_10___2000lb_Laser_Guided_Bomb = {
+    STA_04_02_79___80_BRU32_2x_GBU_10___2000lb_Laser_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_IB_MK_2X_GBU-10}",
-        "name": " [ STA 04/02 | 79/80 | BRU32   ] - 2x GBU-10 - 2000lb Laser Guided Bomb",
+        "name": " [ STA 04/02 | 79 / 80 | BRU32   ] - 2x GBU-10 - 2000lb Laser Guided Bomb",
         "weight": 1892.94,
     }
-    STA_04_02_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = {
+    STA_04_02_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_IB_MK_2X_GBU-12}",
-        "name": " [ STA 04/02 | 79/80 | BRU32   ] - 2x GBU-12 - 500lb Laser Guided Bomb",
+        "name": " [ STA 04/02 | 79 / 80 | BRU32   ] - 2x GBU-12 - 500lb Laser Guided Bomb",
         "weight": 622.94,
     }
-    STA_04_02_79_80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb = {
+    STA_04_02_79___80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_IB_MK_2X_GBU-16}",
-        "name": " [ STA 04/02 | 79/80 | BRU32   ] - 2x GBU-16 - 1000lb Laser Guided Bomb",
+        "name": " [ STA 04/02 | 79 / 80 | BRU32   ] - 2x GBU-16 - 1000lb Laser Guided Bomb",
         "weight": 1094.94,
     }
-    STA_04_02_79_80_BRU32_2x_GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = {
+    STA_04_02_79___80_BRU32_2x_GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_IB_MK_2X_GBU-24}",
-        "name": " [ STA 04/02 | 79/80 | BRU32   ] - 2x GBU-24A/B Paveway III - 2000lb Laser Guided Bomb",
+        "name": " [ STA 04/02 | 79 / 80 | BRU32   ] - 2x GBU-24A/B Paveway III - 2000lb Laser Guided Bomb",
         "weight": 1936.94,
     }
-    STA_04_02_79_80_BRU32_2x_GBU_31_V_1_B___JDAM__2000lb_GPS_Guided_Bomb = {
+    STA_04_02_79___80_BRU32_2x_GBU_31_V_1_B___JDAM__2000lb_GPS_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_IB_MK_2X_GBU-31}",
-        "name": " [ STA 04/02 | 79/80 | BRU32   ] - 2x GBU-31(V)1/B - JDAM, 2000lb GPS Guided Bomb",
+        "name": " [ STA 04/02 | 79 / 80 | BRU32   ] - 2x GBU-31(V)1/B - JDAM, 2000lb GPS Guided Bomb",
         "weight": 1936.94,
     }
-    STA_04_02_79_80_BRU32_2x_GBU_31_V_3_B___JDAM__2000lb_GPS_Guided_Bomb = {
+    STA_04_02_79___80_BRU32_2x_GBU_31_V_3_B___JDAM__2000lb_GPS_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_IB_MK_2X_GBU-31V}",
-        "name": " [ STA 04/02 | 79/80 | BRU32   ] - 2x GBU-31(V)3/B - JDAM, 2000lb GPS Guided Bomb",
+        "name": " [ STA 04/02 | 79 / 80 | BRU32   ] - 2x GBU-31(V)3/B - JDAM, 2000lb GPS Guided Bomb",
         "weight": 2030.94,
     }
-    STA_04_02_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = {
+    STA_04_02_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_IB_MK_2X_GBU-38}",
-        "name": " [ STA 04/02 | 79/80 | BRU32   ] - 2x GBU-38 - JDAM, 500lb GPS Guided Bomb",
+        "name": " [ STA 04/02 | 79 / 80 | BRU32   ] - 2x GBU-38 - JDAM, 500lb GPS Guided Bomb",
         "weight": 550.94,
     }
-    STA_04_02_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = {
+    STA_04_02_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_IB_MK_2X_ROCKEYE}",
-        "name": " [ STA 04/02 | 79/80 | BRU32   ] - 2x Mk-20 Rockeye - 490lbs CBU, 247 x HEAT Bomblets",
+        "name": " [ STA 04/02 | 79 / 80 | BRU32   ] - 2x Mk-20 Rockeye - 490lbs CBU, 247 x HEAT Bomblets",
         "weight": 512.94,
     }
-    STA_04_02_79_80_BRU32_2x_Mk_82Y___500lb_GP_Chute_Retarded_HD = {
+    STA_04_02_79___80_BRU32_2x_Mk_82Y___500lb_GP_Chute_Retarded_HD = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_IB_MK_2X_MK-82Y}",
-        "name": " [ STA 04/02 | 79/80 | BRU32   ] - 2x Mk-82Y - 500lb GP Chute Retarded HD",
+        "name": " [ STA 04/02 | 79 / 80 | BRU32   ] - 2x Mk-82Y - 500lb GP Chute Retarded HD",
         "weight": 532.94,
     }
-    STA_04_02_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = {
+    STA_04_02_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_IB_MK_2X_MK-82_Snakeye}",
-        "name": " [ STA 04/02 | 79/80 | BRU32   ] - 2x Mk-82 Snakeye - 500lb GP Bomb HD",
+        "name": " [ STA 04/02 | 79 / 80 | BRU32   ] - 2x Mk-82 Snakeye - 500lb GP Bomb HD",
         "weight": 567.94,
     }
-    STA_04_02_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = {
+    STA_04_02_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_IB_MK_2X_MK-82}",
-        "name": " [ STA 04/02 | 79/80 | BRU32   ] - 2x Mk-82 - 500lb GP Bomb LD",
+        "name": " [ STA 04/02 | 79 / 80 | BRU32   ] - 2x Mk-82 - 500lb GP Bomb LD",
         "weight": 524.94,
     }
-    STA_04_02_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = {
+    STA_04_02_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_IB_MK_2X_MK-83}",
-        "name": " [ STA 04/02 | 79/80 | BRU32   ] - 2x Mk-83 - 1000lb GP Bomb LD",
+        "name": " [ STA 04/02 | 79 / 80 | BRU32   ] - 2x Mk-83 - 1000lb GP Bomb LD",
         "weight": 976.94,
     }
-    STA_04_02_79_80_BRU32_2x_Mk_84___2000lb_GP_Bomb_LD = {
+    STA_04_02_79___80_BRU32_2x_Mk_84___2000lb_GP_Bomb_LD = {
         "clsid": "{SUPERHORNET_PYLON_02_OB_IB_MK_2X_MK-84}",
-        "name": " [ STA 04/02 | 79/80 | BRU32   ] - 2x Mk-84 - 2000lb GP Bomb LD",
+        "name": " [ STA 04/02 | 79 / 80 | BRU32   ] - 2x Mk-84 - 2000lb GP Bomb LD",
         "weight": 1892.94,
     }
-    STA_04_03_79_80_BRU32_1x_1x_AGM_154C___JSOW_Unitary_BROACH = {
+    STA_04_03_79___80_BRU32_1x_1x_AGM_154C___JSOW_Unitary_BROACH = {
         "clsid": "{SUPERHORNET_PYLON_03_IB_MB_JS_2X_BRU_AGM-154C}",
-        "name": " [ STA 04/03 | 79/80 | BRU32   ] - 1x/1x AGM-154C - JSOW Unitary BROACH",
+        "name": " [ STA 04/03 | 79 / 80 | BRU32   ] - 1x/1x AGM-154C - JSOW Unitary BROACH",
         "weight": 1036.94,
     }
     STA_04_03_SUU79_BRU32_1x_1x_BDU_45B___500lb_Practice_Bomb = {
@@ -1340,9 +1460,14 @@ class WeaponsFA18EF:
         "name": " [ STA 05	  | CHEEK  | LAU116 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 161.48,
     }
-    STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_05_AM_MOD_1X_AIM-120}",
+        "name": " [ STA 05	  | CHEEK  | LAU116 ] - 1x AIM-120D AMRAAM - Active Radar AAM (Modern Missiles Mod Required)",
+        "weight": 157.85,
+    }
+    STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = {
         "clsid": "{SUPERHORNET_PYLON_05_AM_1X_AIM-120D}",
-        "name": " [ STA 05	  | CHEEK  | LAU116 ] - 1x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 05	  | CHEEK  | LAU116 ] - 1x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 162.4,
     }
     STA_05_CHEEK__LAU116_1x_AIM_7F_Sparrow_Semi_Active_Radar = {
@@ -1365,10 +1490,10 @@ class WeaponsFA18EF:
         "name": " [ STA 05	  | CHEEK  | LAU116 ] - 1x AIM-7P Sparrow Semi-Active Radar",
         "weight": 231,
     }
-    STA_05_CHEEK__TGPMNT_Empty_TGP_Mount = {
+    STA_05_CHEEK__TGPMNT_Empty_Weapon_Replacable_Assembly__WRA__Adapter = {
         "clsid": "{SUPERHORNET_PYLON_05_CN_TGP_MOUNT}",
-        "name": " [ STA 05	  | CHEEK  | TGPMNT ] Empty TGP Mount",
-        "weight": 215.5,
+        "name": " [ STA 05	  | CHEEK  | TGPMNT ] Empty Weapon Replacable Assembly (WRA) Adapter",
+        "weight": 25,
     }
     STA_05_CHEEK__TGPMNT_1x_AN_AAQ_28_LITENING___Targeting_Pod = {
         "clsid": "{SUPERHORNET_PYLON_05_TP_AAQ28}",
@@ -1378,11 +1503,11 @@ class WeaponsFA18EF:
     STA_05_CHEEK__TGPMNT_1x_AN_ASQ_228_ATFLIR___Targeting_Pod = {
         "clsid": "{SUPERHORNET_PYLON_05_TP_ASQ228}",
         "name": " [ STA 05	  | CHEEK  | TGPMNT ] - 1x AN/ASQ-228 ATFLIR - Targeting Pod",
-        "weight": 190.5,
+        "weight": 215.5,
     }
-    STA_06_SUU78_BRU32_1x_AN_AAQ_28_LITENING___Targeting_Pod = {
+    STA_06_SUU78_BRU32_1x_AN_AAQ_28_LITENING_Targeting_Pod = {
         "clsid": "{SUPERHORNET_PYLON_06_CN_TP_AAQ28}",
-        "name": " [ STA 06	  | SUU78 | BRU32   ] - 1x AN/AAQ-28 LITENING - Targeting Pod",
+        "name": " [ STA 06	  | SUU78 | BRU32   ] - 1x AN/AAQ-28 LITENING Targeting Pod",
         "weight": 242.47,
     }
     STA_06_SUU78_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod = {
@@ -1390,31 +1515,36 @@ class WeaponsFA18EF:
         "name": " [ STA 06	  | SUU78 | BRU32   ] - 1x AN/AWW-13 Advanced Datalink Pod",
         "weight": 234.47,
     }
-    STA_06_SUU78_BRU32_1x_A_A_42R_1_Aerial_Refueling_Buddy_Pod = {
+    STA_06_SUU78_BRU32_1x_A_A_42R_1__300_GAL__Aerial_Refueling_Buddy_Pod__FUEL_ONLY_ = {
         "clsid": "{SUPERHORNET_PYLON_06_CN_FT_AA42R}",
-        "name": " [ STA 06	  | SUU78 | BRU32   ] - 1x A/A-42R-1 Aerial Refueling Buddy Pod",
-        "weight": 1249.47,
+        "name": " [ STA 06	  | SUU78 | BRU32   ] - 1x A/A-42R-1 (300 GAL) Aerial Refueling Buddy Pod *FUEL ONLY*",
+        "weight": 1332.72,
     }
-    STA_06_SUU78_BRU32_1x_FPU_12_A_Fuel_Tank = {
+    STA_06_SUU78_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = {
         "clsid": "{SUPERHORNET_PYLON_06_CN_FT_FPU-12_Fueltank}",
-        "name": " [ STA 06	  | SUU78 | BRU32   ] - 1x FPU-12/A Fuel Tank",
-        "weight": 1384.47,
+        "name": " [ STA 06	  | SUU78 | BRU32   ] - 1x FPU-12/A (480 GAL) Fuel Tank",
+        "weight": 1634.97,
     }
-    STA_06_SUU78_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = {
+    STA_06_SUU78_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = {
         "clsid": "{SUPERHORNET_PYLON_06_CN_FT_FPU-12_FueltankHighVis}",
-        "name": " [ STA 06	  | SUU78 | BRU32   ] - 1x FPU-12/A Fuel Tank - High Vis",
-        "weight": 1384.47,
+        "name": " [ STA 06	  | SUU78 | BRU32   ] - 1x FPU-12/A (480 GAL) Fuel Tank - High Vis",
+        "weight": 1634.97,
+    }
+    STA_06_SUU78_BRU32_1x_FPU_13_A__340_GAL__with_ASG_34A_V_1_Infrared_Search_and_Track_System___FUEL_ONLY__ = {
+        "clsid": "{SUPERHORNET_PYLON_06_CN_FT_IRST_ASG-34A}",
+        "name": " [ STA 06	  | SUU78 | BRU32   ] - 1x FPU-13/A (340 GAL) with ASG-34A(V)1 Infrared Search and Track System *(FUEL ONLY)*",
+        "weight": 1310.57,
+    }
+    STA_06_SUU78_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = {
+        "clsid": "{SUPERHORNET_PYLON_06_CN_FT_FPU-8A}",
+        "name": " [ STA 06	  | SUU78 | BRU32   ] - 1x FPU-8/A (330 GAL) Fuel Tank",
+        "weight": 1184.47,
     }
     STA_06_SUU78_EMPTY = {
         "clsid": "{SUPERHORNET_PYLON_06_CN_EMPTY}",
         "name": " [ STA 06	  | SUU78 | EMPTY ]",
         "weight": 0,
     }
-    STA_07_SUU79_BRU32_Remove_SUU_79A_A_Pylon = {
-        "clsid": "{SUPERHORNET_PYLON_08_REMOVE_SUU79}",
-        "name": " [ STA 07	  | SUU79 | BRU32   ] Remove SUU-79A/A Pylon",
-        "weight": 0,
-    }
     STA_07_CHEEK__LAU116_1x_AIM_120B_AMRAAM___Active_Radar_AAM = {
         "clsid": "{SUPERHORNET_PYLON_07_AM_1X_AIM-120}",
         "name": " [ STA 07	  | CHEEK  | LAU116 ] - 1x AIM-120B AMRAAM - Active Radar AAM",
@@ -1425,9 +1555,14 @@ class WeaponsFA18EF:
         "name": " [ STA 07	  | CHEEK  | LAU116 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 161.48,
     }
-    STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_07_AM_MOD_1X_AIM-120}",
+        "name": " [ STA 07	  | CHEEK  | LAU116 ] - 1x AIM-120D AMRAAM - Active Radar AAM (Modern Missiles Mod Required)",
+        "weight": 157.85,
+    }
+    STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = {
         "clsid": "{SUPERHORNET_PYLON_07_AM_1X_AIM-120D}",
-        "name": " [ STA 07	  | CHEEK  | LAU116 ] - 1x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 07	  | CHEEK  | LAU116 ] - 1x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 162.4,
     }
     STA_07_CHEEK__LAU116_1x_AIM_7F_Sparrow_Semi_Active_Radar = {
@@ -1450,6 +1585,11 @@ class WeaponsFA18EF:
         "name": " [ STA 07	  | CHEEK  | LAU116 ] - 1x AIM-7P Sparrow Semi-Active Radar",
         "weight": 231,
     }
+    STA_07_SUU79_BRU32_Remove_SUU_79A_A_Pylon = {
+        "clsid": "{SUPERHORNET_PYLON_08_REMOVE_SUU79}",
+        "name": " [ STA 07	  | SUU79 | BRU32   ] Remove SUU-79A/A Pylon",
+        "weight": 0,
+    }
     STA_08_SUU79_BRU32_1x_AGM_154A___JSOW_CEB__CBU_type_ = {
         "clsid": "{SUPERHORNET_PYLON_09_IB_JS_1X_AGM-154A}",
         "name": " [ STA 08	  | SUU79 | BRU32   ] - 1x AGM-154A - JSOW CEB (CBU-type)",
@@ -1485,25 +1625,35 @@ class WeaponsFA18EF:
         "name": " [ STA 08	  | SUU79 | BRU32   ] - 1x AN/AWW-13 Advanced Datalink Pod",
         "weight": 234.47,
     }
-    STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = {
+    STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = {
         "clsid": "{SUPERHORNET_PYLON_08_CN_FT_FPU-12_Fueltank}",
-        "name": " [ STA 08	  | SUU79 | BRU32   ] - 1x FPU-12/A Fuel Tank",
-        "weight": 1384.47,
+        "name": " [ STA 08	  | SUU79 | BRU32   ] - 1x FPU-12/A (480 GAL) Fuel Tank",
+        "weight": 1656.97,
     }
-    STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank_ = {
+    STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_ = {
         "clsid": "{SUPERHORNET_PYLON_09_IB_FT_FPU-12_Fueltank}",
-        "name": " [ STA 08	  | SUU79 | BRU32   ] - 1x FPU-12/A Fuel Tank",
-        "weight": 1384.47,
+        "name": " [ STA 08	  | SUU79 | BRU32   ] - 1x FPU-12/A (480 GAL) Fuel Tank",
+        "weight": 1656.97,
     }
-    STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = {
+    STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = {
         "clsid": "{SUPERHORNET_PYLON_08_CN_FT_FPU-12_FueltankHighVis}",
-        "name": " [ STA 08	  | SUU79 | BRU32   ] - 1x FPU-12/A Fuel Tank - High Vis",
-        "weight": 1384.47,
+        "name": " [ STA 08	  | SUU79 | BRU32   ] - 1x FPU-12/A (480 GAL) Fuel Tank - High Vis",
+        "weight": 1656.97,
     }
-    STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis_ = {
+    STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis_ = {
         "clsid": "{SUPERHORNET_PYLON_09_IB_FT_FPU-12_FueltankHighVis}",
-        "name": " [ STA 08	  | SUU79 | BRU32   ] - 1x FPU-12/A Fuel Tank - High Vis",
-        "weight": 1384.47,
+        "name": " [ STA 08	  | SUU79 | BRU32   ] - 1x FPU-12/A (480 GAL) Fuel Tank - High Vis",
+        "weight": 1656.97,
+    }
+    STA_08_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = {
+        "clsid": "{SUPERHORNET_PYLON_08_IB_FT_FPU-8A}",
+        "name": " [ STA 08	  | SUU79 | BRU32   ] - 1x FPU-8/A (330 GAL) Fuel Tank",
+        "weight": 1184.47,
+    }
+    STA_08_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank_ = {
+        "clsid": "{SUPERHORNET_PYLON_09_IB_FT_FPU-8A}",
+        "name": " [ STA 08	  | SUU79 | BRU32   ] - 1x FPU-8/A (330 GAL) Fuel Tank",
+        "weight": 1184.47,
     }
     STA_08_SUU79_BRU33_2x_BDU_45B___500lb_Practice_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_09_IB_MK_BR2_BDU-45B}",
@@ -1635,9 +1785,14 @@ class WeaponsFA18EF:
         "name": " [ STA 08	  | SUU79 | LAU127 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 340.98,
     }
-    STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_09_IB_AM_MOD_1X_AIM-120}",
+        "name": " [ STA 08	  | SUU79 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM (Modern Missiles Mod Required)",
+        "weight": 337.35,
+    }
+    STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = {
         "clsid": "{SUPERHORNET_PYLON_09_IB_AM_1X_AIM-120D}",
-        "name": " [ STA 08	  | SUU79 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 08	  | SUU79 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 341.9,
     }
     STA_08_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM = {
@@ -1645,6 +1800,11 @@ class WeaponsFA18EF:
         "name": " [ STA 08	  | SUU79 | LAU127 ] - 1x AIM-9M Sidewinder IR AAM",
         "weight": 265.22,
     }
+    STA_08_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_09_IB_SW_MOD_1X_AIM-9X2}",
+        "name": " [ STA 08	  | SUU79 | LAU127 ] - 1x AIM-9X-2+ Sidewinder IR AAM, (Modern Missiles Mod Required)",
+        "weight": 263.96,
+    }
     STA_08_SUU79_LAU127_1x_AIM_9X_Sidewinder_IR_AAM = {
         "clsid": "{SUPERHORNET_PYLON_09_IB_SW_1X_AIM-9X}",
         "name": " [ STA 08	  | SUU79 | LAU127 ] - 1x AIM-9X Sidewinder IR AAM",
@@ -1670,9 +1830,14 @@ class WeaponsFA18EF:
         "name": " [ STA 08	  | SUU79 | LAU127 ] - 2x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 502.46,
     }
-    STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_09_IB_AM_MOD_2X_AIM-120}",
+        "name": " [ STA 08	  | SUU79 | LAU127 ] - 2x AIM-120D AMRAAM - Active Radar AAM (Modern Missiles Mod Required)",
+        "weight": 495.2,
+    }
+    STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = {
         "clsid": "{SUPERHORNET_PYLON_09_IB_AM_2X_AIM-120D}",
-        "name": " [ STA 08	  | SUU79 | LAU127 ] - 2x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 08	  | SUU79 | LAU127 ] - 2x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 504.3,
     }
     STA_08_SUU79_LAU127_2x_AIM_9M_Sidewinder_IR_AAM = {
@@ -1680,6 +1845,11 @@ class WeaponsFA18EF:
         "name": " [ STA 08	  | SUU79 | LAU127 ] - 2x AIM-9M Sidewinder IR AAM",
         "weight": 350.94,
     }
+    STA_08_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_09_IB_SW_MOD_2X_AIM-9X2}",
+        "name": " [ STA 08	  | SUU79 | LAU127 ] - 2x AIM-9X-2+ Sidewinder IR AAM, (Modern Missiles Mod Required)",
+        "weight": 348.42,
+    }
     STA_08_SUU79_LAU127_2x_AIM_9X_Sidewinder_IR_AAM = {
         "clsid": "{SUPERHORNET_PYLON_09_IB_SW_2X_AIM-9X}",
         "name": " [ STA 08	  | SUU79 | LAU127 ] - 2x AIM-9X Sidewinder IR AAM",
@@ -1810,25 +1980,40 @@ class WeaponsFA18EF:
         "name": " [ STA 09	  | SUU79 | BRU32   ] - 1x AGM-154C - JSOW Unitary BROACH",
         "weight": 518.47,
     }
+    STA_09_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_ = {
+        "clsid": "{SUPERHORNET_PYLON_09_IB_AM_174_1X_AIM-120_AI}",
+        "name": " [ STA 09	  | SUU79 | BRU32   ] - 1x AIM-174B Gunslinger - Active Radar AAM, (AI Only)",
+        "weight": 195.95,
+    }
+    STA_09_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_09_IB_AM_174_1X_AIM-120}",
+        "name": " [ STA 09	  | SUU79 | BRU32   ] - 1x AIM-174B Gunslinger - Active Radar AAM, (Current Hill's AIM-174B Mod Required)",
+        "weight": 195.95,
+    }
     STA_09_SUU79_BRU32_1x_ALQ_167_Countermeasures_System = {
         "clsid": "{SUPERHORNET_PYLON_09_MB_PD_1X_ALQ-167}",
         "name": " [ STA 09	  | SUU79 | BRU32   ] - 1x ALQ-167 Countermeasures System",
-        "weight": 84.47,
+        "weight": 141.518,
     }
     STA_09_SUU79_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod = {
         "clsid": "{SUPERHORNET_PYLON_09_MB_PD_1X_AWW-13}",
         "name": " [ STA 09	  | SUU79 | BRU32   ] - 1x AN/AWW-13 Advanced Datalink Pod",
         "weight": 234.47,
     }
-    STA_09_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = {
+    STA_09_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = {
         "clsid": "{SUPERHORNET_PYLON_09_MB_FT_FPU-12_Fueltank}",
-        "name": " [ STA 09	  | SUU79 | BRU32   ] - 1x FPU-12/A Fuel Tank",
-        "weight": 1384.47,
+        "name": " [ STA 09	  | SUU79 | BRU32   ] - 1x FPU-12/A (480 GAL) Fuel Tank",
+        "weight": 1656.97,
     }
-    STA_09_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = {
+    STA_09_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = {
         "clsid": "{SUPERHORNET_PYLON_09_MB_FT_FPU-12_FueltankHighVis}",
-        "name": " [ STA 09	  | SUU79 | BRU32   ] - 1x FPU-12/A Fuel Tank - High Vis",
-        "weight": 1384.47,
+        "name": " [ STA 09	  | SUU79 | BRU32   ] - 1x FPU-12/A (480 GAL) Fuel Tank - High Vis",
+        "weight": 1656.97,
+    }
+    STA_09_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = {
+        "clsid": "{SUPERHORNET_PYLON_09_MB_FT_FPU-8A}",
+        "name": " [ STA 09	  | SUU79 | BRU32   ] - 1x FPU-8/A (330 GAL) Fuel Tank",
+        "weight": 1184.47,
     }
     STA_09_SUU79_BRU32_1x_GBU_10___2000lb_Laser_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_10_MB_MK_1X_GBU-10}",
@@ -2140,14 +2325,24 @@ class WeaponsFA18EF:
         "name": " [ STA 09	  | SUU79 | LAU127 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 340.98,
     }
-    STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_09_MB_AM_MOD_1X_AIM-120}",
+        "name": " [ STA 09	  | SUU79 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM (Modern Missiles Mod Required)",
+        "weight": 337.35,
+    }
+    STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__ = {
+        "clsid": "{SUPERHORNET_PYLON_10_MB_AM_MOD_1X_AIM-120}",
+        "name": " [ STA 09	  | SUU79 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM (Modern Missiles Mod Required)",
+        "weight": 337.35,
+    }
+    STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = {
         "clsid": "{SUPERHORNET_PYLON_09_MB_AM_1X_AIM-120D}",
-        "name": " [ STA 09	  | SUU79 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 09	  | SUU79 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 341.9,
     }
-    STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__ = {
+    STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = {
         "clsid": "{SUPERHORNET_PYLON_10_MB_AM_1X_AIM-120D}",
-        "name": " [ STA 09	  | SUU79 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 09	  | SUU79 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 341.9,
     }
     STA_09_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM = {
@@ -2160,6 +2355,16 @@ class WeaponsFA18EF:
         "name": " [ STA 09	  | SUU79 | LAU127 ] - 1x AIM-9M Sidewinder IR AAM",
         "weight": 265.22,
     }
+    STA_09_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_09_MB_SW_MOD_1X_AIM-9X2}",
+        "name": " [ STA 09	  | SUU79 | LAU127 ] - 1x AIM-9X-2+ Sidewinder IR AAM, (Modern Missiles Mod Required)",
+        "weight": 263.96,
+    }
+    STA_09_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__ = {
+        "clsid": "{SUPERHORNET_PYLON_10_MB_SW_MOD_1X_AIM-9X2}",
+        "name": " [ STA 09	  | SUU79 | LAU127 ] - 1x AIM-9X-2+ Sidewinder IR AAM, (Modern Missiles Mod Required)",
+        "weight": 263.96,
+    }
     STA_09_SUU79_LAU127_1x_AIM_9X_Sidewinder_IR_AAM = {
         "clsid": "{SUPERHORNET_PYLON_09_MB_SW_1X_AIM-9X}",
         "name": " [ STA 09	  | SUU79 | LAU127 ] - 1x AIM-9X Sidewinder IR AAM",
@@ -2210,14 +2415,24 @@ class WeaponsFA18EF:
         "name": " [ STA 09	  | SUU79 | LAU127 ] - 2x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 502.46,
     }
-    STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_09_MB_AM_MOD_2X_AIM-120}",
+        "name": " [ STA 09	  | SUU79 | LAU127 ] - 2x AIM-120D AMRAAM - Active Radar AAM (Modern Missiles Mod Required)",
+        "weight": 495.2,
+    }
+    STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__ = {
+        "clsid": "{SUPERHORNET_PYLON_10_MB_AM_MOD_2X_AIM-120}",
+        "name": " [ STA 09	  | SUU79 | LAU127 ] - 2x AIM-120D AMRAAM - Active Radar AAM (Modern Missiles Mod Required)",
+        "weight": 495.2,
+    }
+    STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = {
         "clsid": "{SUPERHORNET_PYLON_09_MB_AM_2X_AIM-120D}",
-        "name": " [ STA 09	  | SUU79 | LAU127 ] - 2x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 09	  | SUU79 | LAU127 ] - 2x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 504.3,
     }
-    STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__ = {
+    STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = {
         "clsid": "{SUPERHORNET_PYLON_10_MB_AM_2X_AIM-120D}",
-        "name": " [ STA 09	  | SUU79 | LAU127 ] - 2x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 09	  | SUU79 | LAU127 ] - 2x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 504.3,
     }
     STA_09_SUU79_LAU127_2x_AIM_9M_Sidewinder_IR_AAM = {
@@ -2230,6 +2445,16 @@ class WeaponsFA18EF:
         "name": " [ STA 09	  | SUU79 | LAU127 ] - 2x AIM-9M Sidewinder IR AAM",
         "weight": 350.94,
     }
+    STA_09_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_09_MB_SW_MOD_2X_AIM-9X2}",
+        "name": " [ STA 09	  | SUU79 | LAU127 ] - 2x AIM-9X-2+ Sidewinder IR AAM, (Modern Missiles Mod Required)",
+        "weight": 348.42,
+    }
+    STA_09_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__ = {
+        "clsid": "{SUPERHORNET_PYLON_10_MB_SW_MOD_2X_AIM-9X2}",
+        "name": " [ STA 09	  | SUU79 | LAU127 ] - 2x AIM-9X-2+ Sidewinder IR AAM, (Modern Missiles Mod Required)",
+        "weight": 348.42,
+    }
     STA_09_SUU79_LAU127_2x_AIM_9X_Sidewinder_IR_AAM = {
         "clsid": "{SUPERHORNET_PYLON_09_MB_SW_2X_AIM-9X}",
         "name": " [ STA 09	  | SUU79 | LAU127 ] - 2x AIM-9X Sidewinder IR AAM",
@@ -2440,94 +2665,114 @@ class WeaponsFA18EF:
         "name": " [ STA 09/08 | SUU79 | BRU32   ] - 1x/1x Mk-84 - 2000lb GP Bomb LD",
         "weight": 1892.94,
     }
-    STA_09_10_79_80_BRU32_2x_GBU_10___2000lb_Laser_Guided_Bomb = {
+    STA_09_08_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_ = {
+        "clsid": "{SUPERHORNET_PYLON_09_IB_AM_174_2X_AIM-120_AI}",
+        "name": " [ STA 09/08 | SUU79 | BRU32   ] - 2x AIM-174B Gunslinger - Active Radar AAM, (AI Only)",
+        "weight": 391.9,
+    }
+    STA_09_08_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_09_IB_AM_174_2X_AIM-120}",
+        "name": " [ STA 09/08 | SUU79 | BRU32   ] - 2x AIM-174B Gunslinger - Active Radar AAM, (Current Hill's AIM-174B Mod Required)",
+        "weight": 391.9,
+    }
+    STA_09_10_79___80_BRU32_2x_GBU_10___2000lb_Laser_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_MB_MK_2X_GBU-10}",
-        "name": " [ STA 09/10 | 79/80 | BRU32   ] - 2x GBU-10 - 2000lb Laser Guided Bomb",
+        "name": " [ STA 09/10 | 79 / 80 | BRU32   ] - 2x GBU-10 - 2000lb Laser Guided Bomb",
         "weight": 1892.94,
     }
-    STA_09_10_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = {
+    STA_09_10_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_MB_MK_2X_GBU-12}",
-        "name": " [ STA 09/10 | 79/80 | BRU32   ] - 2x GBU-12 - 500lb Laser Guided Bomb",
+        "name": " [ STA 09/10 | 79 / 80 | BRU32   ] - 2x GBU-12 - 500lb Laser Guided Bomb",
         "weight": 622.94,
     }
-    STA_09_10_79_80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb = {
+    STA_09_10_79___80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_MB_MK_2X_GBU-16}",
-        "name": " [ STA 09/10 | 79/80 | BRU32   ] - 2x GBU-16 - 1000lb Laser Guided Bomb",
+        "name": " [ STA 09/10 | 79 / 80 | BRU32   ] - 2x GBU-16 - 1000lb Laser Guided Bomb",
         "weight": 1094.94,
     }
-    STA_09_10_79_80_BRU32_2x_GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = {
+    STA_09_10_79___80_BRU32_2x_GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_MB_MK_2X_GBU-24}",
-        "name": " [ STA 09/10 | 79/80 | BRU32   ] - 2x GBU-24A/B Paveway III - 2000lb Laser Guided Bomb",
+        "name": " [ STA 09/10 | 79 / 80 | BRU32   ] - 2x GBU-24A/B Paveway III - 2000lb Laser Guided Bomb",
         "weight": 1936.94,
     }
-    STA_09_10_79_80_BRU32_2x_GBU_31_V_1_B___JDAM__2000lb_GPS_Guided_Bomb = {
+    STA_09_10_79___80_BRU32_2x_GBU_31_V_1_B___JDAM__2000lb_GPS_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_MB_MK_2X_GBU-31}",
-        "name": " [ STA 09/10 | 79/80 | BRU32   ] - 2x GBU-31(V)1/B - JDAM, 2000lb GPS Guided Bomb",
+        "name": " [ STA 09/10 | 79 / 80 | BRU32   ] - 2x GBU-31(V)1/B - JDAM, 2000lb GPS Guided Bomb",
         "weight": 1936.94,
     }
-    STA_09_10_79_80_BRU32_2x_GBU_31_V_3_B___JDAM__2000lb_GPS_Guided_Bomb = {
+    STA_09_10_79___80_BRU32_2x_GBU_31_V_3_B___JDAM__2000lb_GPS_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_MB_MK_2X_GBU-31V}",
-        "name": " [ STA 09/10 | 79/80 | BRU32   ] - 2x GBU-31(V)3/B - JDAM, 2000lb GPS Guided Bomb",
+        "name": " [ STA 09/10 | 79 / 80 | BRU32   ] - 2x GBU-31(V)3/B - JDAM, 2000lb GPS Guided Bomb",
         "weight": 2030.94,
     }
-    STA_09_10_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = {
+    STA_09_10_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_MB_MK_2X_GBU-38}",
-        "name": " [ STA 09/10 | 79/80 | BRU32   ] - 2x GBU-38 - JDAM, 500lb GPS Guided Bomb",
+        "name": " [ STA 09/10 | 79 / 80 | BRU32   ] - 2x GBU-38 - JDAM, 500lb GPS Guided Bomb",
         "weight": 550.94,
     }
-    STA_09_10_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = {
+    STA_09_10_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_MB_MK_2X_ROCKEYE}",
-        "name": " [ STA 09/10 | 79/80 | BRU32   ] - 2x Mk-20 Rockeye - 490lbs CBU, 247 x HEAT Bomblets",
+        "name": " [ STA 09/10 | 79 / 80 | BRU32   ] - 2x Mk-20 Rockeye - 490lbs CBU, 247 x HEAT Bomblets",
         "weight": 512.94,
     }
-    STA_09_10_79_80_BRU32_2x_Mk_82Y___500lb_GP_Chute_Retarded_HD = {
+    STA_09_10_79___80_BRU32_2x_Mk_82Y___500lb_GP_Chute_Retarded_HD = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_MB_MK_2X_MK-82Y}",
-        "name": " [ STA 09/10 | 79/80 | BRU32   ] - 2x Mk-82Y - 500lb GP Chute Retarded HD",
+        "name": " [ STA 09/10 | 79 / 80 | BRU32   ] - 2x Mk-82Y - 500lb GP Chute Retarded HD",
         "weight": 532.94,
     }
-    STA_09_10_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = {
+    STA_09_10_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_MB_MK_2X_MK-82_Snakeye}",
-        "name": " [ STA 09/10 | 79/80 | BRU32   ] - 2x Mk-82 Snakeye - 500lb GP Bomb HD",
+        "name": " [ STA 09/10 | 79 / 80 | BRU32   ] - 2x Mk-82 Snakeye - 500lb GP Bomb HD",
         "weight": 567.94,
     }
-    STA_09_10_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = {
+    STA_09_10_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_MB_MK_2X_MK-82}",
-        "name": " [ STA 09/10 | 79/80 | BRU32   ] - 2x Mk-82 - 500lb GP Bomb LD",
+        "name": " [ STA 09/10 | 79 / 80 | BRU32   ] - 2x Mk-82 - 500lb GP Bomb LD",
         "weight": 524.94,
     }
-    STA_09_10_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = {
+    STA_09_10_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_MB_MK_2X_MK-83}",
-        "name": " [ STA 09/10 | 79/80 | BRU32   ] - 2x Mk-83 - 1000lb GP Bomb LD",
+        "name": " [ STA 09/10 | 79 / 80 | BRU32   ] - 2x Mk-83 - 1000lb GP Bomb LD",
         "weight": 976.94,
     }
-    STA_09_10_79_80_BRU32_2x_Mk_84___2000lb_GP_Bomb_LD = {
+    STA_09_10_79___80_BRU32_2x_Mk_84___2000lb_GP_Bomb_LD = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_MB_MK_2X_MK-84}",
-        "name": " [ STA 09/10 | 79/80 | BRU32   ] - 2x Mk-84 - 2000lb GP Bomb LD",
+        "name": " [ STA 09/10 | 79 / 80 | BRU32   ] - 2x Mk-84 - 2000lb GP Bomb LD",
         "weight": 1892.94,
     }
-    STA_09_10_79_80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM = {
+    STA_09_10_79___80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM = {
         "clsid": "{SUPERHORNET_PYLON_10_MB_OB_AM_2X_AIM-120}",
-        "name": " [ STA 09/10 | 79/80 | LAU127 ] - 1x/1x AIM-120B AMRAAM - Active Radar AAM",
+        "name": " [ STA 09/10 | 79 / 80 | LAU127 ] - 1x/1x AIM-120B AMRAAM - Active Radar AAM",
         "weight": 547.3,
     }
-    STA_09_10_79_80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM = {
+    STA_09_10_79___80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM = {
         "clsid": "{SUPERHORNET_PYLON_10_MB_OB_AM_2X_AIM-120C}",
-        "name": " [ STA 09/10 | 79/80 | LAU127 ] - 1x/1x AIM-120C AMRAAM - Active Radar AAM",
+        "name": " [ STA 09/10 | 79 / 80 | LAU127 ] - 1x/1x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 554.56,
     }
-    STA_09_10_79_80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_09_10_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_10_MB_OB_AM_MOD_2X_AIM-120}",
+        "name": " [ STA 09/10 | 79 / 80 | LAU127 ] - 1x/1x AIM-120D AMRAAM - Active Radar AAM (Modern Missiles Mod Required)",
+        "weight": 547.3,
+    }
+    STA_09_10_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = {
         "clsid": "{SUPERHORNET_PYLON_10_MB_OB_AM_2X_AIM-120D}",
-        "name": " [ STA 09/10 | 79/80 | LAU127 ] - 1x/1x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 09/10 | 79 / 80 | LAU127 ] - 1x/1x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 556.4,
     }
-    STA_09_10_79_80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM = {
+    STA_09_10_79___80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM = {
         "clsid": "{SUPERHORNET_PYLON_10_MB_OB_SW_2X_AIM-9}",
-        "name": " [ STA 09/10 | 79/80 | LAU127 ] - 1x/1x AIM-9M Sidewinder IR AAM",
+        "name": " [ STA 09/10 | 79 / 80 | LAU127 ] - 1x/1x AIM-9M Sidewinder IR AAM",
         "weight": 403.04,
     }
-    STA_09_10_79_80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM = {
+    STA_09_10_79___80_LAU127_1x_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_10_MB_OB_SW_MOD_2X_AIM-9X2}",
+        "name": " [ STA 09/10 | 79 / 80 | LAU127 ] - 1x/1x AIM-9X-2+ Sidewinder IR AAM, (Modern Missiles Mod Required)",
+        "weight": 400.52,
+    }
+    STA_09_10_79___80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM = {
         "clsid": "{SUPERHORNET_PYLON_10_MB_OB_SW_2X_AIM-9X}",
-        "name": " [ STA 09/10 | 79/80 | LAU127 ] - 1x/1x AIM-9X Sidewinder IR AAM",
+        "name": " [ STA 09/10 | 79 / 80 | LAU127 ] - 1x/1x AIM-9X Sidewinder IR AAM",
         "weight": 400.52,
     }
     STA_10_SUU80_BRU32_1x_BDU_45B___500lb_Practice_Bomb = {
@@ -2650,9 +2895,14 @@ class WeaponsFA18EF:
         "name": " [ STA 10	  | SUU80 | LAU127 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 213.58,
     }
-    STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_10_AM_MOD_1X_AIM-120}",
+        "name": " [ STA 10	  | SUU80 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM (Modern Missiles Mod Required)",
+        "weight": 209.95,
+    }
+    STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = {
         "clsid": "{SUPERHORNET_PYLON_10_AM_1X_AIM-120D}",
-        "name": " [ STA 10	  | SUU80 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 10	  | SUU80 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 214.5,
     }
     STA_10_SUU80_LAU127_1x_AIM_9M_Sidewinder_IR_AAM = {
@@ -2660,6 +2910,11 @@ class WeaponsFA18EF:
         "name": " [ STA 10	  | SUU80 | LAU127 ] - 1x AIM-9M Sidewinder IR AAM",
         "weight": 137.82,
     }
+    STA_10_SUU80_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_10_SW_MOD_1X_AIM-9X2}",
+        "name": " [ STA 10	  | SUU80 | LAU127 ] - 1x AIM-9X-2+ Sidewinder IR AAM, (Modern Missiles Mod Required)",
+        "weight": 136.56,
+    }
     STA_10_SUU80_LAU127_1x_AIM_9X_Sidewinder_IR_AAM = {
         "clsid": "{SUPERHORNET_PYLON_10_SW_1X_AIM-9X}",
         "name": " [ STA 10	  | SUU80 | LAU127 ] - 1x AIM-9X Sidewinder IR AAM",
@@ -2680,69 +2935,69 @@ class WeaponsFA18EF:
         "name": " [ STA 10	  | SUU80 | LAU127 ] - 1x Marvin LAU-127 Rail Launcher for AIM-120B/C/D and AIM9L/M/X",
         "weight": 52.1,
     }
-    STA_10_08_79_80_BRU32_2x_GBU_10___2000lb_Laser_Guided_Bomb = {
+    STA_10_08_79___80_BRU32_2x_GBU_10___2000lb_Laser_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_IB_MK_2X_GBU-10}",
-        "name": " [ STA 10/08 | 79/80 | BRU32   ] - 2x GBU-10 - 2000lb Laser Guided Bomb",
+        "name": " [ STA 10/08 | 79 / 80 | BRU32   ] - 2x GBU-10 - 2000lb Laser Guided Bomb",
         "weight": 1892.94,
     }
-    STA_10_08_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = {
+    STA_10_08_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_IB_MK_2X_GBU-12}",
-        "name": " [ STA 10/08 | 79/80 | BRU32   ] - 2x GBU-12 - 500lb Laser Guided Bomb",
+        "name": " [ STA 10/08 | 79 / 80 | BRU32   ] - 2x GBU-12 - 500lb Laser Guided Bomb",
         "weight": 622.94,
     }
-    STA_10_08_79_80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb = {
+    STA_10_08_79___80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_IB_MK_2X_GBU-16}",
-        "name": " [ STA 10/08 | 79/80 | BRU32   ] - 2x GBU-16 - 1000lb Laser Guided Bomb",
+        "name": " [ STA 10/08 | 79 / 80 | BRU32   ] - 2x GBU-16 - 1000lb Laser Guided Bomb",
         "weight": 1094.94,
     }
-    STA_10_08_79_80_BRU32_2x_GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = {
+    STA_10_08_79___80_BRU32_2x_GBU_24A_B_Paveway_III___2000lb_Laser_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_IB_MK_2X_GBU-24}",
-        "name": " [ STA 10/08 | 79/80 | BRU32   ] - 2x GBU-24A/B Paveway III - 2000lb Laser Guided Bomb",
+        "name": " [ STA 10/08 | 79 / 80 | BRU32   ] - 2x GBU-24A/B Paveway III - 2000lb Laser Guided Bomb",
         "weight": 1936.94,
     }
-    STA_10_08_79_80_BRU32_2x_GBU_31_V_1_B___JDAM__2000lb_GPS_Guided_Bomb = {
+    STA_10_08_79___80_BRU32_2x_GBU_31_V_1_B___JDAM__2000lb_GPS_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_IB_MK_2X_GBU-31}",
-        "name": " [ STA 10/08 | 79/80 | BRU32   ] - 2x GBU-31(V)1/B - JDAM, 2000lb GPS Guided Bomb",
+        "name": " [ STA 10/08 | 79 / 80 | BRU32   ] - 2x GBU-31(V)1/B - JDAM, 2000lb GPS Guided Bomb",
         "weight": 1936.94,
     }
-    STA_10_08_79_80_BRU32_2x_GBU_31_V_3_B___JDAM__2000lb_GPS_Guided_Bomb = {
+    STA_10_08_79___80_BRU32_2x_GBU_31_V_3_B___JDAM__2000lb_GPS_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_IB_MK_2X_GBU-31V}",
-        "name": " [ STA 10/08 | 79/80 | BRU32   ] - 2x GBU-31(V)3/B - JDAM, 2000lb GPS Guided Bomb",
+        "name": " [ STA 10/08 | 79 / 80 | BRU32   ] - 2x GBU-31(V)3/B - JDAM, 2000lb GPS Guided Bomb",
         "weight": 2030.94,
     }
-    STA_10_08_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = {
+    STA_10_08_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_IB_MK_2X_GBU-38}",
-        "name": " [ STA 10/08 | 79/80 | BRU32   ] - 2x GBU-38 - JDAM, 500lb GPS Guided Bomb",
+        "name": " [ STA 10/08 | 79 / 80 | BRU32   ] - 2x GBU-38 - JDAM, 500lb GPS Guided Bomb",
         "weight": 550.94,
     }
-    STA_10_08_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = {
+    STA_10_08_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_IB_MK_2X_ROCKEYE}",
-        "name": " [ STA 10/08 | 79/80 | BRU32   ] - 2x Mk-20 Rockeye - 490lbs CBU, 247 x HEAT Bomblets",
+        "name": " [ STA 10/08 | 79 / 80 | BRU32   ] - 2x Mk-20 Rockeye - 490lbs CBU, 247 x HEAT Bomblets",
         "weight": 512.94,
     }
-    STA_10_08_79_80_BRU32_2x_Mk_82Y___500lb_GP_Chute_Retarded_HD = {
+    STA_10_08_79___80_BRU32_2x_Mk_82Y___500lb_GP_Chute_Retarded_HD = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_IB_MK_2X_MK-82Y}",
-        "name": " [ STA 10/08 | 79/80 | BRU32   ] - 2x Mk-82Y - 500lb GP Chute Retarded HD",
+        "name": " [ STA 10/08 | 79 / 80 | BRU32   ] - 2x Mk-82Y - 500lb GP Chute Retarded HD",
         "weight": 532.94,
     }
-    STA_10_08_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = {
+    STA_10_08_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_IB_MK_2X_MK-82_Snakeye}",
-        "name": " [ STA 10/08 | 79/80 | BRU32   ] - 2x Mk-82 Snakeye - 500lb GP Bomb HD",
+        "name": " [ STA 10/08 | 79 / 80 | BRU32   ] - 2x Mk-82 Snakeye - 500lb GP Bomb HD",
         "weight": 567.94,
     }
-    STA_10_08_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = {
+    STA_10_08_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_IB_MK_2X_MK-82}",
-        "name": " [ STA 10/08 | 79/80 | BRU32   ] - 2x Mk-82 - 500lb GP Bomb LD",
+        "name": " [ STA 10/08 | 79 / 80 | BRU32   ] - 2x Mk-82 - 500lb GP Bomb LD",
         "weight": 524.94,
     }
-    STA_10_08_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = {
+    STA_10_08_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_IB_MK_2X_MK-83}",
-        "name": " [ STA 10/08 | 79/80 | BRU32   ] - 2x Mk-83 - 1000lb GP Bomb LD",
+        "name": " [ STA 10/08 | 79 / 80 | BRU32   ] - 2x Mk-83 - 1000lb GP Bomb LD",
         "weight": 976.94,
     }
-    STA_10_08_79_80_BRU32_2x_Mk_84___2000lb_GP_Bomb_LD = {
+    STA_10_08_79___80_BRU32_2x_Mk_84___2000lb_GP_Bomb_LD = {
         "clsid": "{SUPERHORNET_PYLON_10_OB_IB_MK_2X_MK-84}",
-        "name": " [ STA 10/08 | 79/80 | BRU32   ] - 2x Mk-84 - 2000lb GP Bomb LD",
+        "name": " [ STA 10/08 | 79 / 80 | BRU32   ] - 2x Mk-84 - 2000lb GP Bomb LD",
         "weight": 1892.94,
     }
     STA_11_WNGTP_LAU127_1x_AIM_9M_Sidewinder_IR_AAM = {
@@ -2750,6 +3005,11 @@ class WeaponsFA18EF:
         "name": " [ STA 11	  | WNGTP | LAU127 ] - 1x AIM-9M Sidewinder IR AAM",
         "weight": 85.72,
     }
+    STA_11_WNGTP_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = {
+        "clsid": "{SUPERHORNET_PYLON_11_SW_MOD_1X_AIM-9X2}",
+        "name": " [ STA 11	  | WNGTP | LAU127 ] - 1x AIM-9X-2+ Sidewinder IR AAM, (Modern Missiles Mod Required)",
+        "weight": 84.46,
+    }
     STA_11_WNGTP_LAU127_1x_AIM_9X_Sidewinder_IR_AAM = {
         "clsid": "{SUPERHORNET_PYLON_11_SW_1X_AIM-9X}",
         "name": " [ STA 11	  | WNGTP | LAU127 ] - 1x AIM-9X Sidewinder IR AAM",
@@ -2770,11 +3030,6 @@ class WeaponsFA18EF:
         "name": " [ STA AX	  | AUX	 | PILOT ] - 1x Hood Displayed Folded Flag",
         "weight": 0,
     }
-    STA_AX_AUX_PILOT_1x_Hood_Displayed_Folded_Flag_ = {
-        "clsid": "{GROWLER_PYLON_XX_CN_HOOD_FLAG}",
-        "name": " [ STA AX	  | AUX	 | PILOT ] - 1x Hood Displayed Folded Flag",
-        "weight": 0,
-    }
     STA_AX_CKPIT_SMOKE_1x_Internal_Smoke_Generator___Blue = {
         "clsid": "{SUPERHORNET_PYLON_IN_PD_1X_SMOKE_BLUE}",
         "name": " [ STA AX	  | CKPIT | SMOKE ] - 1x Internal Smoke Generator - Blue",
@@ -2805,744 +3060,749 @@ class WeaponsFA18EF:
         "name": " [ STA AX	  | CKPIT | SMOKE ] - 1x Internal Smoke Generator - Yellow",
         "weight": 15,
     }
-    STA_AX_FUEL_CELLS_1x_Internal_Auxillary_Fuel_Cells = {
+    STA_AX_FUEL_CELLS_1x_Internal_Auxillary_Fuel_Cells__570_GAL_ = {
         "clsid": "{SUPERHORNET_PYLON_IN_FT_AUX_CELLS}",
-        "name": " [ STA AX	  | FUEL	 | CELLS ] - 1x Internal Auxillary Fuel Cells",
+        "name": " [ STA AX	  | FUEL	 | CELLS ] - 1x Internal Auxillary Fuel Cells (570 GAL)",
         "weight": 1670,
     }
 
 
 class WeaponsEA18G:
-    STA_02_SUU80_LA115_1x_AIM_7F_Sparrow_Semi_Active_Radar = {
+    STA_02_SUU80_LAU115_1x_AIM_7F_Sparrow_Semi_Active_Radar_ = {
         "clsid": "{GROWLER_PYLON_02_SP_1X_AIM-7F}",
-        "name": " [ STA 02	  | SUU80 | LA115 ] - 1x AIM-7F Sparrow Semi-Active Radar",
+        "name": " [ STA 02	  | SUU80 | LAU115 ] - 1x AIM-7F Sparrow Semi-Active Radar",
         "weight": 319.87,
     }
-    STA_02_SUU80_LA115_1x_AIM_7MH_Sparrow_Semi_Active_Radar = {
+    STA_02_SUU80_LAU115_1x_AIM_7MH_Sparrow_Semi_Active_Radar_ = {
         "clsid": "{GROWLER_PYLON_02_SP_1X_AIM-7H}",
-        "name": " [ STA 02	  | SUU80 | LA115 ] - 1x AIM-7MH Sparrow Semi-Active Radar",
+        "name": " [ STA 02	  | SUU80 | LAU115 ] - 1x AIM-7MH Sparrow Semi-Active Radar",
         "weight": 319.87,
     }
-    STA_02_SUU80_LA115_1x_AIM_7M_Sparrow_Semi_Active_Radar = {
+    STA_02_SUU80_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar_ = {
         "clsid": "{GROWLER_PYLON_02_SP_1X_AIM-7M}",
-        "name": " [ STA 02	  | SUU80 | LA115 ] - 1x AIM-7M Sparrow Semi-Active Radar",
+        "name": " [ STA 02	  | SUU80 | LAU115 ] - 1x AIM-7M Sparrow Semi-Active Radar",
         "weight": 319.87,
     }
-    STA_02_SUU80_LA115_1x_AIM_7P_Sparrow_Semi_Active_Radar = {
+    STA_02_SUU80_LAU115_1x_AIM_7P_Sparrow_Semi_Active_Radar_ = {
         "clsid": "{GROWLER_PYLON_02_SP_1X_AIM-7P}",
-        "name": " [ STA 02	  | SUU80 | LA115 ] - 1x AIM-7P Sparrow Semi-Active Radar",
+        "name": " [ STA 02	  | SUU80 | LAU115 ] - 1x AIM-7P Sparrow Semi-Active Radar",
         "weight": 319.87,
     }
-    STA_02_SUU80_LA118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = {
+    STA_02_SUU80_LAU118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_ = {
         "clsid": "{GROWLER_PYLON_02_OB_AR_1X_AGM-88}",
-        "name": " [ STA 02	  | SUU80 | LA118 ] - 1x AGM-88C HARM - High Speed Anti-Radiation Missile",
+        "name": " [ STA 02	  | SUU80 | LAU118 ] - 1x AGM-88C HARM - High Speed Anti-Radiation Missile",
         "weight": 440.87,
     }
-    STA_02_SUU80_LA127_1x_AIM_120B_AMRAAM___Active_Radar_AAM = {
+    STA_02_SUU80_LAU127_1x_AIM_120B_AMRAAM___Active_Radar_AAM_ = {
         "clsid": "{GROWLER_PYLON_02_OB_AM_1X_AIM-120}",
-        "name": " [ STA 02	  | SUU80 | LA127 ] - 1x AIM-120B AMRAAM - Active Radar AAM",
+        "name": " [ STA 02	  | SUU80 | LAU127 ] - 1x AIM-120B AMRAAM - Active Radar AAM",
         "weight": 337.32,
     }
-    STA_02_SUU80_LA127_1x_AIM_120C_AMRAAM___Active_Radar_AAM = {
+    STA_02_SUU80_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM_ = {
         "clsid": "{GROWLER_PYLON_02_OB_AM_1X_AIM-120C}",
-        "name": " [ STA 02	  | SUU80 | LA127 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
+        "name": " [ STA 02	  | SUU80 | LAU127 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 340.95,
     }
-    STA_02_SUU80_LA127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = {
         "clsid": "{GROWLER_PYLON_02_OB_AM_1X_AIM-120D}",
-        "name": " [ STA 02	  | SUU80 | LA127 ] - 1x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 02	  | SUU80 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 341.87,
     }
-    STA_02_SUU80_LA127_1x_AIM_9M_Sidewinder_IR_AAM = {
+    STA_02_SUU80_LAU127_1x_AIM_9M_Sidewinder_IR_AAM_ = {
         "clsid": "{GROWLER_PYLON_02_OB_SW_1X_AIM-9}",
-        "name": " [ STA 02	  | SUU80 | LA127 ] - 1x AIM-9M Sidewinder IR AAM",
+        "name": " [ STA 02	  | SUU80 | LAU127 ] - 1x AIM-9M Sidewinder IR AAM",
         "weight": 265.19,
     }
-    STA_02_SUU80_LA127_1x_AIM_9M_Sidewinder_IR_AAM_ = {
+    STA_02_SUU80_LAU127_1x_AIM_9M_Sidewinder_IR_AAM__ = {
         "clsid": "{GROWLER_PYLON_03_OB_SW_1X_AIM-9}",
-        "name": " [ STA 02	  | SUU80 | LA127 ] - 1x AIM-9M Sidewinder IR AAM",
+        "name": " [ STA 02	  | SUU80 | LAU127 ] - 1x AIM-9M Sidewinder IR AAM",
         "weight": 137.82,
     }
-    STA_02_SUU80_LA127_1x_AIM_9X_Sidewinder_IR_AAM = {
+    STA_02_SUU80_LAU127_1x_AIM_9X_Sidewinder_IR_AAM_ = {
         "clsid": "{GROWLER_PYLON_02_OB_SW_1X_AIM-9X}",
-        "name": " [ STA 02	  | SUU80 | LA127 ] - 1x AIM-9X Sidewinder IR AAM",
+        "name": " [ STA 02	  | SUU80 | LAU127 ] - 1x AIM-9X Sidewinder IR AAM",
         "weight": 263.93,
     }
-    STA_02_SUU80_LA127_1x_AIM_9X_Sidewinder_IR_AAM_ = {
+    STA_02_SUU80_LAU127_1x_AIM_9X_Sidewinder_IR_AAM__ = {
         "clsid": "{GROWLER_PYLON_03_OB_SW_1X_AIM-9X}",
-        "name": " [ STA 02	  | SUU80 | LA127 ] - 1x AIM-9X Sidewinder IR AAM",
+        "name": " [ STA 02	  | SUU80 | LAU127 ] - 1x AIM-9X Sidewinder IR AAM",
         "weight": 136.56,
     }
-    STA_02_SUU80_LA127_1x_AN_ASQ_T50_V_1_TCTS_Pod = {
+    STA_02_SUU80_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod_ = {
         "clsid": "{GROWLER_PYLON_02_PD_ais-pod-t50}",
-        "name": " [ STA 02	  | SUU80 | LA127 ] - 1x AN/ASQ-T50(V)1 TCTS Pod",
+        "name": " [ STA 02	  | SUU80 | LAU127 ] - 1x AN/ASQ-T50(V)1 TCTS Pod",
         "weight": 114.7,
     }
-    STA_02_SUU80_LA127_1x_Captive_AIM_9M_for_ACM = {
+    STA_02_SUU80_LAU127_1x_Captive_AIM_9M_for_ACM_ = {
         "clsid": "{GROWLER_PYLON_02_OB_SW_1X_C}",
-        "name": " [ STA 02	  | SUU80 | LA127 ] - 1x Captive AIM-9M for ACM",
+        "name": " [ STA 02	  | SUU80 | LAU127 ] - 1x Captive AIM-9M for ACM",
         "weight": 265.2,
     }
-    STA_02_SUU80_LA127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X = {
+    STA_02_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X_ = {
         "clsid": "{GROWLER_PYLON_02_LAU127}",
-        "name": " [ STA 02	  | SUU80 | LA127 ] - 1x Marvin LAU-127 Rail Launcher for AIM-120B/C/D and AIM9L/M/X",
+        "name": " [ STA 02	  | SUU80 | LAU127 ] - 1x Marvin LAU-127 Rail Launcher for AIM-120B/C/D and AIM9L/M/X",
         "weight": 52.1,
     }
-    STA_02_SUU80_LA127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X_ = {
+    STA_02_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X__ = {
         "clsid": "{GROWLER_PYLON_03_OB_LAU127}",
-        "name": " [ STA 02	  | SUU80 | LA127 ] - 1x Marvin LAU-127 Rail Launcher for AIM-120B/C/D and AIM9L/M/X",
+        "name": " [ STA 02	  | SUU80 | LAU127 ] - 1x Marvin LAU-127 Rail Launcher for AIM-120B/C/D and AIM9L/M/X",
         "weight": 52.1,
     }
     STA_03_SUU79_BRU32_1x_AN_ALQ_249_Mid_Band_Next_Generation_Jamming_Pod = {
         "clsid": "{GROWLER_PYLON_03_MB_ALQ_249_MID_BAND}",
-        "name": " [ STA 03	  | SUU79 | BRU32 ] - 1x AN/ALQ-249 Mid Band Next Generation Jamming Pod",
+        "name": " [ STA 03	  | SUU79 | BRU32   ] - 1x AN/ALQ-249 Mid Band Next Generation Jamming Pod",
         "weight": 534.47,
     }
     STA_03_SUU79_BRU32_1x_AN_ALQ_99_ICAP_III_High_Band_Jamming_Pod = {
         "clsid": "{GROWLER_PYLON_03_MB_ALQ_99_HI_BAND}",
-        "name": " [ STA 03	  | SUU79 | BRU32 ] - 1x AN/ALQ-99 ICAP III High Band Jamming Pod",
+        "name": " [ STA 03	  | SUU79 | BRU32   ] - 1x AN/ALQ-99 ICAP III High Band Jamming Pod",
         "weight": 465.383,
     }
-    STA_03_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = {
+    STA_03_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_ = {
         "clsid": "{GROWLER_PYLON_02_MB_FT_FPU-12_Fueltank}",
-        "name": " [ STA 03	  | SUU79 | BRU32 ] - 1x FPU-12/A Fuel Tank",
-        "weight": 1384.47,
+        "name": " [ STA 03	  | SUU79 | BRU32   ] - 1x FPU-12/A (480 GAL) Fuel Tank",
+        "weight": 1656.97,
     }
-    STA_03_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = {
+    STA_03_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis_ = {
         "clsid": "{GROWLER_PYLON_02_MB_FT_FPU-12_FueltankHighVis}",
-        "name": " [ STA 03	  | SUU79 | BRU32 ] - 1x FPU-12/A Fuel Tank - High Vis",
-        "weight": 1384.47,
+        "name": " [ STA 03	  | SUU79 | BRU32   ] - 1x FPU-12/A (480 GAL) Fuel Tank - High Vis",
+        "weight": 1656.97,
     }
-    STA_03_SUU79_LA118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = {
+    STA_03_SUU79_LAU118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_ = {
         "clsid": "{GROWLER_PYLON_02_MB_AR_1X_AGM-88}",
-        "name": " [ STA 03	  | SUU79 | LA118 ] - 1x AGM-88C HARM - High Speed Anti-Radiation Missile",
+        "name": " [ STA 03	  | SUU79 | LAU118 ] - 1x AGM-88C HARM - High Speed Anti-Radiation Missile",
         "weight": 440.87,
     }
-    STA_03_SUU79_LA127_1x_AIM_120B_AMRAAM___Active_Radar_AAM = {
+    STA_03_SUU79_LAU127_1x_AIM_120B_AMRAAM___Active_Radar_AAM__ = {
         "clsid": "{GROWLER_PYLON_02_MB_AM_1X_AIM-120}",
-        "name": " [ STA 03	  | SUU79 | LA127 ] - 1x AIM-120B AMRAAM - Active Radar AAM",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 1x AIM-120B AMRAAM - Active Radar AAM",
         "weight": 337.32,
     }
-    STA_03_SUU79_LA127_1x_AIM_120B_AMRAAM___Active_Radar_AAM_ = {
+    STA_03_SUU79_LAU127_1x_AIM_120B_AMRAAM___Active_Radar_AAM___ = {
         "clsid": "{GROWLER_PYLON_03_MB_AM_1X_AIM-120}",
-        "name": " [ STA 03	  | SUU79 | LA127 ] - 1x AIM-120B AMRAAM - Active Radar AAM",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 1x AIM-120B AMRAAM - Active Radar AAM",
         "weight": 337.32,
     }
-    STA_03_SUU79_LA127_1x_AIM_120B_AMRAAM___Active_Radar_AAM__ = {
+    STA_03_SUU79_LAU127_1x_AIM_120B_AMRAAM___Active_Radar_AAM____ = {
         "clsid": "{GROWLER_PYLON_03_MB_AM_1X_AIM-9}",
-        "name": " [ STA 03	  | SUU79 | LA127 ] - 1x AIM-120B AMRAAM - Active Radar AAM",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 1x AIM-120B AMRAAM - Active Radar AAM",
         "weight": 337.32,
     }
-    STA_03_SUU79_LA127_1x_AIM_120C_AMRAAM___Active_Radar_AAM = {
+    STA_03_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM__ = {
         "clsid": "{GROWLER_PYLON_02_MB_AM_1X_AIM-120C}",
-        "name": " [ STA 03	  | SUU79 | LA127 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 340.95,
     }
-    STA_03_SUU79_LA127_1x_AIM_120C_AMRAAM___Active_Radar_AAM_ = {
+    STA_03_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM___ = {
         "clsid": "{GROWLER_PYLON_03_MB_AM_1X_AIM-120C}",
-        "name": " [ STA 03	  | SUU79 | LA127 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 340.95,
     }
-    STA_03_SUU79_LA127_1x_AIM_120C_AMRAAM___Active_Radar_AAM__ = {
+    STA_03_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM____ = {
         "clsid": "{GROWLER_PYLON_03_MB_AM_1X_AIM-9X}",
-        "name": " [ STA 03	  | SUU79 | LA127 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 340.95,
     }
-    STA_03_SUU79_LA127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only___ = {
         "clsid": "{GROWLER_PYLON_02_MB_AM_1X_AIM-120D}",
-        "name": " [ STA 03	  | SUU79 | LA127 ] - 1x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 341.87,
     }
-    STA_03_SUU79_LA127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__ = {
+    STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only____ = {
         "clsid": "{GROWLER_PYLON_03_MB_AM_1X_AIM-120D}",
-        "name": " [ STA 03	  | SUU79 | LA127 ] - 1x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 341.87,
     }
-    STA_03_SUU79_LA127_1x_AIM_9M_Sidewinder_IR_AAM = {
+    STA_03_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM__ = {
         "clsid": "{GROWLER_PYLON_02_MB_SW_1X_AIM-9}",
-        "name": " [ STA 03	  | SUU79 | LA127 ] - 1x AIM-9M Sidewinder IR AAM",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 1x AIM-9M Sidewinder IR AAM",
         "weight": 265.19,
     }
-    STA_03_SUU79_LA127_1x_AIM_9X_Sidewinder_IR_AAM = {
+    STA_03_SUU79_LAU127_1x_AIM_9X_Sidewinder_IR_AAM__ = {
         "clsid": "{GROWLER_PYLON_02_MB_SW_1X_AIM-9X}",
-        "name": " [ STA 03	  | SUU79 | LA127 ] - 1x AIM-9X Sidewinder IR AAM",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 1x AIM-9X Sidewinder IR AAM",
         "weight": 263.93,
     }
-    STA_03_SUU79_LA127_1x_Captive_AIM_9M_for_ACM = {
+    STA_03_SUU79_LAU127_1x_Captive_AIM_9M_for_ACM__ = {
         "clsid": "{GROWLER_PYLON_02_MB_SW_1X_CATM-9M}",
-        "name": " [ STA 03	  | SUU79 | LA127 ] - 1x Captive AIM-9M for ACM",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 1x Captive AIM-9M for ACM",
         "weight": 265.2,
     }
-    STA_03_SUU79_LA127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X = {
+    STA_03_SUU79_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X = {
         "clsid": "{GROWLER_PYLON_03_MB_LAU127}",
-        "name": " [ STA 03	  | SUU79 | LA127 ] - 1x Marvin LAU-127 Rail Launcher for AIM-120B/C/D and AIM9L/M/X",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 1x Marvin LAU-127 Rail Launcher for AIM-120B/C/D and AIM9L/M/X",
         "weight": 52.1,
     }
-    STA_03_SUU79_LA127_2x_AIM_120B_AMRAAM___Active_Radar_AAM = {
+    STA_03_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM__ = {
         "clsid": "{GROWLER_PYLON_02_MB_AM_2X_AIM-120}",
-        "name": " [ STA 03	  | SUU79 | LA127 ] - 2x AIM-120B AMRAAM - Active Radar AAM",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 2x AIM-120B AMRAAM - Active Radar AAM",
         "weight": 495.17,
     }
-    STA_03_SUU79_LA127_2x_AIM_120B_AMRAAM___Active_Radar_AAM_ = {
+    STA_03_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM___ = {
         "clsid": "{GROWLER_PYLON_03_MB_AM_2X_AIM-120}",
-        "name": " [ STA 03	  | SUU79 | LA127 ] - 2x AIM-120B AMRAAM - Active Radar AAM",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 2x AIM-120B AMRAAM - Active Radar AAM",
         "weight": 495.17,
     }
-    STA_03_SUU79_LA127_2x_AIM_120B_AMRAAM___Active_Radar_AAM__ = {
+    STA_03_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM____ = {
         "clsid": "{GROWLER_PYLON_03_MB_AM_2X_AIM-9}",
-        "name": " [ STA 03	  | SUU79 | LA127 ] - 2x AIM-120B AMRAAM - Active Radar AAM",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 2x AIM-120B AMRAAM - Active Radar AAM",
         "weight": 495.17,
     }
-    STA_03_SUU79_LA127_2x_AIM_120C_AMRAAM___Active_Radar_AAM = {
+    STA_03_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM__ = {
         "clsid": "{GROWLER_PYLON_02_MB_AM_2X_AIM-120C}",
-        "name": " [ STA 03	  | SUU79 | LA127 ] - 2x AIM-120C AMRAAM - Active Radar AAM",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 2x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 502.43,
     }
-    STA_03_SUU79_LA127_2x_AIM_120C_AMRAAM___Active_Radar_AAM_ = {
+    STA_03_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM___ = {
         "clsid": "{GROWLER_PYLON_03_MB_AM_2X_AIM-120C}",
-        "name": " [ STA 03	  | SUU79 | LA127 ] - 2x AIM-120C AMRAAM - Active Radar AAM",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 2x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 502.43,
     }
-    STA_03_SUU79_LA127_2x_AIM_120C_AMRAAM___Active_Radar_AAM__ = {
+    STA_03_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM____ = {
         "clsid": "{GROWLER_PYLON_03_MB_AM_2X_AIM-9X}",
-        "name": " [ STA 03	  | SUU79 | LA127 ] - 2x AIM-120C AMRAAM - Active Radar AAM",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 2x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 502.43,
     }
-    STA_03_SUU79_LA127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only___ = {
         "clsid": "{GROWLER_PYLON_02_MB_AM_2X_AIM-120D}",
-        "name": " [ STA 03	  | SUU79 | LA127 ] - 2x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 2x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 504.27,
     }
-    STA_03_SUU79_LA127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__ = {
+    STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only____ = {
         "clsid": "{GROWLER_PYLON_03_MB_AM_2X_AIM-120D}",
-        "name": " [ STA 03	  | SUU79 | LA127 ] - 2x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 2x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 504.27,
     }
-    STA_03_SUU79_LA127_2x_AIM_9M_Sidewinder_IR_AAM = {
+    STA_03_SUU79_LAU127_2x_AIM_9M_Sidewinder_IR_AAM__ = {
         "clsid": "{GROWLER_PYLON_02_MB_SW_2X_AIM-9}",
-        "name": " [ STA 03	  | SUU79 | LA127 ] - 2x AIM-9M Sidewinder IR AAM",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 2x AIM-9M Sidewinder IR AAM",
         "weight": 350.91,
     }
-    STA_03_SUU79_LA127_2x_AIM_9X_Sidewinder_IR_AAM = {
+    STA_03_SUU79_LAU127_2x_AIM_9X_Sidewinder_IR_AAM__ = {
         "clsid": "{GROWLER_PYLON_02_MB_SW_2X_AIM-9X}",
-        "name": " [ STA 03	  | SUU79 | LA127 ] - 2x AIM-9X Sidewinder IR AAM",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 2x AIM-9X Sidewinder IR AAM",
         "weight": 348.39,
     }
-    STA_03_SUU79_LA127_2x_Captive_AIM_9M_for_ACM = {
+    STA_03_SUU79_LAU127_2x_Captive_AIM_9M_for_ACM__ = {
         "clsid": "{GROWLER_PYLON_02_MB_SW_2X_CATM-9M}",
-        "name": " [ STA 03	  | SUU79 | LA127 ] - 2x Captive AIM-9M for ACM",
+        "name": " [ STA 03	  | SUU79 | LAU127 ] - 2x Captive AIM-9M for ACM",
         "weight": 350.93,
     }
-    STA_04_SUU79_BRU32_1x_AGM_154A___JSOW_CEB__CBU_type_ = {
+    STA_04_SUU79_BRU32_1x_AGM_154A___JSOW_CEB__CBU_type__ = {
         "clsid": "{GROWLER_PYLON_04_IB_JS_1X_AGM-154A}",
-        "name": " [ STA 04	  | SUU79 | BRU32 ] - 1x AGM-154A - JSOW CEB (CBU-type)",
+        "name": " [ STA 04	  | SUU79 | BRU32   ] - 1x AGM-154A - JSOW CEB (CBU-type)",
         "weight": 519.47,
     }
-    STA_04_SUU79_BRU32_1x_AGM_154C___JSOW_Unitary_BROACH = {
+    STA_04_SUU79_BRU32_1x_AGM_154C___JSOW_Unitary_BROACH_ = {
         "clsid": "{GROWLER_PYLON_04_IB_JS_1X_AGM-154C}",
-        "name": " [ STA 04	  | SUU79 | BRU32 ] - 1x AGM-154C - JSOW Unitary BROACH",
+        "name": " [ STA 04	  | SUU79 | BRU32   ] - 1x AGM-154C - JSOW Unitary BROACH",
         "weight": 518.47,
     }
-    STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = {
+    STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank__ = {
         "clsid": "{GROWLER_PYLON_04_IB_FT_FPU-12_Fueltank}",
-        "name": " [ STA 04	  | SUU79 | BRU32 ] - 1x FPU-12/A Fuel Tank",
-        "weight": 1384.47,
+        "name": " [ STA 04	  | SUU79 | BRU32   ] - 1x FPU-12/A (480 GAL) Fuel Tank",
+        "weight": 1656.97,
     }
-    STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank_ = {
-        "clsid": "{GROWLER_PYLON_08_IB_FT_FPU-12_Fueltank}",
-        "name": " [ STA 04	  | SUU79 | BRU32 ] - 1x FPU-12/A Fuel Tank",
-        "weight": 1384.47,
-    }
-    STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = {
+    STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis__ = {
         "clsid": "{GROWLER_PYLON_04_IB_FT_FPU-12_FueltankHighVis}",
-        "name": " [ STA 04	  | SUU79 | BRU32 ] - 1x FPU-12/A Fuel Tank - High Vis",
-        "weight": 1384.47,
+        "name": " [ STA 04	  | SUU79 | BRU32   ] - 1x FPU-12/A (480 GAL) Fuel Tank - High Vis",
+        "weight": 1656.97,
     }
-    STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis_ = {
-        "clsid": "{GROWLER_PYLON_08_IB_FT_FPU-12_FueltankHighVis}",
-        "name": " [ STA 04	  | SUU79 | BRU32 ] - 1x FPU-12/A Fuel Tank - High Vis",
-        "weight": 1384.47,
-    }
-    STA_04_SUU79_BRU55_1x_AGM_154A___JSOW_CEB__CBU_type_ = {
+    STA_04_SUU79_BRU55_1x_AGM_154A___JSOW_CEB__CBU_type__ = {
         "clsid": "{GROWLER_PYLON_04_IB_JS_1X_BRU_AGM-154A}",
-        "name": " [ STA 04	  | SUU79 | BRU55 ] - 1x AGM-154A - JSOW CEB (CBU-type)",
+        "name": " [ STA 04	  | SUU79 | BRU55   ] - 1x AGM-154A - JSOW CEB (CBU-type)",
         "weight": 606.97,
     }
-    STA_04_SUU79_BRU55_1x_AGM_154C___JSOW_Unitary_BROACH = {
+    STA_04_SUU79_BRU55_1x_AGM_154C___JSOW_Unitary_BROACH_ = {
         "clsid": "{GROWLER_PYLON_04_IB_JS_1X_BRU_AGM-154C}",
-        "name": " [ STA 04	  | SUU79 | BRU55 ] - 1x AGM-154C - JSOW Unitary BROACH",
+        "name": " [ STA 04	  | SUU79 | BRU55   ] - 1x AGM-154C - JSOW Unitary BROACH",
         "weight": 605.97,
     }
-    STA_04_SUU79_BRU55_2x_AGM_154A___JSOW_CEB__CBU_type_ = {
+    STA_04_SUU79_BRU55_2x_AGM_154A___JSOW_CEB__CBU_type__ = {
         "clsid": "{GROWLER_PYLON_04_IB_JS_2X_BRU_AGM-154A}",
-        "name": " [ STA 04	  | SUU79 | BRU55 ] - 2x AGM-154A - JSOW CEB (CBU-type)",
+        "name": " [ STA 04	  | SUU79 | BRU55   ] - 2x AGM-154A - JSOW CEB (CBU-type)",
         "weight": 1091.97,
     }
-    STA_04_SUU79_BRU55_2x_AGM_154C___JSOW_Unitary_BROACH = {
+    STA_04_SUU79_BRU55_2x_AGM_154C___JSOW_Unitary_BROACH_ = {
         "clsid": "{GROWLER_PYLON_04_IB_JS_2X_BRU_AGM-154C}",
-        "name": " [ STA 04	  | SUU79 | BRU55 ] - 2x AGM-154C - JSOW Unitary BROACH",
+        "name": " [ STA 04	  | SUU79 | BRU55   ] - 2x AGM-154C - JSOW Unitary BROACH",
         "weight": 1089.97,
     }
-    STA_04_SUU79_LA127_1x_AIM_120B_AMRAAM___Active_Radar_AAM = {
+    STA_04_SUU79_LAU127_1x_AIM_120B_AMRAAM___Active_Radar_AAM_ = {
         "clsid": "{GROWLER_PYLON_04_IB_AM_1X_AIM-120}",
-        "name": " [ STA 04	  | SUU79 | LA127 ] - 1x AIM-120B AMRAAM - Active Radar AAM",
+        "name": " [ STA 04	  | SUU79 | LAU127 ] - 1x AIM-120B AMRAAM - Active Radar AAM",
         "weight": 337.32,
     }
-    STA_04_SUU79_LA127_1x_AIM_120C_AMRAAM___Active_Radar_AAM = {
+    STA_04_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM_ = {
         "clsid": "{GROWLER_PYLON_04_IB_AM_1X_AIM-120C}",
-        "name": " [ STA 04	  | SUU79 | LA127 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
+        "name": " [ STA 04	  | SUU79 | LAU127 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 340.95,
     }
-    STA_04_SUU79_LA127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = {
         "clsid": "{GROWLER_PYLON_04_IB_AM_1X_AIM-120D}",
-        "name": " [ STA 04	  | SUU79 | LA127 ] - 1x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 04	  | SUU79 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 341.87,
     }
-    STA_04_SUU79_LA127_1x_AIM_9M_Sidewinder_IR_AAM = {
+    STA_04_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM_ = {
         "clsid": "{GROWLER_PYLON_04_IB_SW_1X_AIM-9}",
-        "name": " [ STA 04	  | SUU79 | LA127 ] - 1x AIM-9M Sidewinder IR AAM",
+        "name": " [ STA 04	  | SUU79 | LAU127 ] - 1x AIM-9M Sidewinder IR AAM",
         "weight": 265.19,
     }
-    STA_04_SUU79_LA127_1x_AIM_9X_Sidewinder_IR_AAM = {
+    STA_04_SUU79_LAU127_1x_AIM_9X_Sidewinder_IR_AAM_ = {
         "clsid": "{GROWLER_PYLON_04_IB_SW_1X_AIM-9X}",
-        "name": " [ STA 04	  | SUU79 | LA127 ] - 1x AIM-9X Sidewinder IR AAM",
+        "name": " [ STA 04	  | SUU79 | LAU127 ] - 1x AIM-9X Sidewinder IR AAM",
         "weight": 263.93,
     }
-    STA_04_SUU79_LA127_1x_Captive_AIM_9M_for_ACM = {
+    STA_04_SUU79_LAU127_1x_Captive_AIM_9M_for_ACM_ = {
         "clsid": "{GROWLER_PYLON_04_IB_SW_1X_CATM-9M}",
-        "name": " [ STA 04	  | SUU79 | LA127 ] - 1x Captive AIM-9M for ACM",
+        "name": " [ STA 04	  | SUU79 | LAU127 ] - 1x Captive AIM-9M for ACM",
         "weight": 265.2,
     }
-    STA_04_SUU79_LA127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X = {
+    STA_04_SUU79_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X_ = {
         "clsid": "{GROWLER_PYLON_04_IB_LAU127}",
-        "name": " [ STA 04	  | SUU79 | LA127 ] - 1x Marvin LAU-127 Rail Launcher for AIM-120B/C/D and AIM9L/M/X",
+        "name": " [ STA 04	  | SUU79 | LAU127 ] - 1x Marvin LAU-127 Rail Launcher for AIM-120B/C/D and AIM9L/M/X",
         "weight": 52.1,
     }
-    STA_04_SUU79_LA127_2x_AIM_120B_AMRAAM___Active_Radar_AAM = {
+    STA_04_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM_ = {
         "clsid": "{GROWLER_PYLON_04_IB_AM_2X_AIM-120}",
-        "name": " [ STA 04	  | SUU79 | LA127 ] - 2x AIM-120B AMRAAM - Active Radar AAM",
+        "name": " [ STA 04	  | SUU79 | LAU127 ] - 2x AIM-120B AMRAAM - Active Radar AAM",
         "weight": 495.17,
     }
-    STA_04_SUU79_LA127_2x_AIM_120C_AMRAAM___Active_Radar_AAM = {
+    STA_04_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM_ = {
         "clsid": "{GROWLER_PYLON_04_IB_AM_2X_AIM-120C}",
-        "name": " [ STA 04	  | SUU79 | LA127 ] - 2x AIM-120C AMRAAM - Active Radar AAM",
+        "name": " [ STA 04	  | SUU79 | LAU127 ] - 2x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 502.43,
     }
-    STA_04_SUU79_LA127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = {
         "clsid": "{GROWLER_PYLON_04_IB_AM_2X_AIM-120D}",
-        "name": " [ STA 04	  | SUU79 | LA127 ] - 2x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 04	  | SUU79 | LAU127 ] - 2x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 504.27,
     }
-    STA_04_SUU79_LA127_2x_AIM_9M_Sidewinder_IR_AAM = {
+    STA_04_SUU79_LAU127_2x_AIM_9M_Sidewinder_IR_AAM_ = {
         "clsid": "{GROWLER_PYLON_04_IB_SW_2X_AIM-9}",
-        "name": " [ STA 04	  | SUU79 | LA127 ] - 2x AIM-9M Sidewinder IR AAM",
+        "name": " [ STA 04	  | SUU79 | LAU127 ] - 2x AIM-9M Sidewinder IR AAM",
         "weight": 350.91,
     }
-    STA_04_SUU79_LA127_2x_AIM_9X_Sidewinder_IR_AAM = {
+    STA_04_SUU79_LAU127_2x_AIM_9X_Sidewinder_IR_AAM_ = {
         "clsid": "{GROWLER_PYLON_04_IB_SW_2X_AIM-9X}",
-        "name": " [ STA 04	  | SUU79 | LA127 ] - 2x AIM-9X Sidewinder IR AAM",
+        "name": " [ STA 04	  | SUU79 | LAU127 ] - 2x AIM-9X Sidewinder IR AAM",
         "weight": 348.39,
     }
-    STA_04_SUU79_LA127_2x_Captive_AIM_9M_for_ACM = {
+    STA_04_SUU79_LAU127_2x_Captive_AIM_9M_for_ACM_ = {
         "clsid": "{GROWLER_PYLON_04_IB_SW_2X_CATM-9M}",
-        "name": " [ STA 04	  | SUU79 | LA127 ] - 2x Captive AIM-9M for ACM",
+        "name": " [ STA 04	  | SUU79 | LAU127 ] - 2x Captive AIM-9M for ACM",
         "weight": 350.93,
     }
-    STA_04_SUU80_LA118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = {
+    STA_04_SUU80_LAU118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = {
         "clsid": "{GROWLER_PYLON_04_IB_AR_1X_AGM-88}",
-        "name": " [ STA 04	  | SUU80 | LA118 ] - 1x AGM-88C HARM - High Speed Anti-Radiation Missile",
+        "name": " [ STA 04	  | SUU80 | LAU118 ] - 1x AGM-88C HARM - High Speed Anti-Radiation Missile",
         "weight": 440.87,
     }
-    STA_05_LA116_LA116_Empty_AIM_7_120_Ejectors = {
+    STA_05_LA116_LAU116_Empty_AIM_7_120_Ejectors = {
         "clsid": "{GROWLER_PYLON_05_FL_EMPTY}",
-        "name": " [ STA 05	  | LA116 | LA116 ] Empty AIM-7/120 Ejectors",
+        "name": " [ STA 05	  | LA116 | LAU116 ] Empty AIM-7/120 Ejectors",
         "weight": 0,
     }
-    STA_05_LA116_LA116_1x_AIM_120B_AMRAAM___Active_Radar_AAM = {
+    STA_05_LA116_LAU116_1x_AIM_120B_AMRAAM___Active_Radar_AAM = {
         "clsid": "{GROWLER_PYLON_05_AM_1X_AIM-120}",
-        "name": " [ STA 05	  | LA116 | LA116 ] - 1x AIM-120B AMRAAM - Active Radar AAM",
+        "name": " [ STA 05	  | LA116 | LAU116 ] - 1x AIM-120B AMRAAM - Active Radar AAM",
         "weight": 157.85,
     }
-    STA_05_LA116_LA116_1x_AIM_120C_AMRAAM___Active_Radar_AAM = {
+    STA_05_LA116_LAU116_1x_AIM_120C_AMRAAM___Active_Radar_AAM = {
         "clsid": "{GROWLER_PYLON_05_AM_1X_AIM-120C}",
-        "name": " [ STA 05	  | LA116 | LA116 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
+        "name": " [ STA 05	  | LA116 | LAU116 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 161.48,
     }
-    STA_05_LA116_LA116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_05_LA116_LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = {
         "clsid": "{GROWLER_PYLON_05_AM_1X_AIM-120D}",
-        "name": " [ STA 05	  | LA116 | LA116 ] - 1x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 05	  | LA116 | LAU116 ] - 1x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 162.4,
     }
-    STA_05_LA116_LA116_1x_AIM_7F_Sparrow_Semi_Active_Radar = {
+    STA_05_LA116_LAU116_1x_AIM_7F_Sparrow_Semi_Active_Radar = {
         "clsid": "{GROWLER_PYLON_05_SP_1X_AIM-7F}",
-        "name": " [ STA 05	  | LA116 | LA116 ] - 1x AIM-7F Sparrow Semi-Active Radar",
+        "name": " [ STA 05	  | LA116 | LAU116 ] - 1x AIM-7F Sparrow Semi-Active Radar",
         "weight": 231,
     }
-    STA_05_LA116_LA116_1x_AIM_7MH_Sparrow_Semi_Active_Radar = {
+    STA_05_LA116_LAU116_1x_AIM_7MH_Sparrow_Semi_Active_Radar = {
         "clsid": "{GROWLER_PYLON_05_SP_1X_AIM-7H}",
-        "name": " [ STA 05	  | LA116 | LA116 ] - 1x AIM-7MH Sparrow Semi-Active Radar",
+        "name": " [ STA 05	  | LA116 | LAU116 ] - 1x AIM-7MH Sparrow Semi-Active Radar",
         "weight": 231,
     }
-    STA_05_LA116_LA116_1x_AIM_7M_Sparrow_Semi_Active_Radar = {
+    STA_05_LA116_LAU116_1x_AIM_7M_Sparrow_Semi_Active_Radar = {
         "clsid": "{GROWLER_PYLON_05_SP_1X_AIM-7M}",
-        "name": " [ STA 05	  | LA116 | LA116 ] - 1x AIM-7M Sparrow Semi-Active Radar",
+        "name": " [ STA 05	  | LA116 | LAU116 ] - 1x AIM-7M Sparrow Semi-Active Radar",
         "weight": 231,
     }
-    STA_05_LA116_LA116_1x_AIM_7P_Sparrow_Semi_Active_Radar = {
+    STA_05_LA116_LAU116_1x_AIM_7P_Sparrow_Semi_Active_Radar = {
         "clsid": "{GROWLER_PYLON_05_SP_1X_AIM-7P}",
-        "name": " [ STA 05	  | LA116 | LA116 ] - 1x AIM-7P Sparrow Semi-Active Radar",
+        "name": " [ STA 05	  | LA116 | LAU116 ] - 1x AIM-7P Sparrow Semi-Active Radar",
         "weight": 231,
     }
-    STA_05_LA116_TPMNT_Empty_TGP_Mount = {
+    STA_05_LA116_TPMNT_Empty_Weapon_Replacable_Assembly__WRA__Adapter = {
         "clsid": "{GROWLER_PYLON_05_CN_TGP_MOUNT}",
-        "name": " [ STA 05	  | LA116 | TPMNT ] Empty TGP Mount",
+        "name": " [ STA 05	  | LA116 | TPMNT ] Empty Weapon Replacable Assembly (WRA) Adapter",
         "weight": 0,
     }
-    STA_05_LA116_TPMNT_1x_AN_AAQ_28_LITENING___Targeting_Pod = {
-        "clsid": "{GROWLER_PYLON_05_TP_AAQ28}",
-        "name": " [ STA 05	  | LA116 | TPMNT ] - 1x AN/AAQ-28 LITENING - Targeting Pod",
-        "weight": 208,
-    }
     STA_05_LA116_TPMNT_1x_AN_ASQ_228_ATFLIR___Targeting_Pod = {
         "clsid": "{GROWLER_PYLON_05_TP_ASQ228}",
         "name": " [ STA 05	  | LA116 | TPMNT ] - 1x AN/ASQ-228 ATFLIR - Targeting Pod",
         "weight": 195,
     }
+    STA_06_SUU78_BRU32_1x_AN_AAQ_28_LITENING___Targeting_Pod = {
+        "clsid": "{GROWLER_PYLON_06_TP_AAQ28}",
+        "name": " [ STA 06	  | SUU78 | BRU32   ] - 1x AN/AAQ-28 LITENING - Targeting Pod",
+        "weight": 242.47,
+    }
     STA_06_SUU78_BRU32_1x_AN_ALQ_99_ICAP_III_Low_Band_Jamming_Pod = {
         "clsid": "{GROWLER_PYLON_06_CN_ANALQ_99_LO_BAND}",
-        "name": " [ STA 06	  | SUU78 | BRU32 ] - 1x AN/ALQ-99 ICAP III Low Band Jamming Pod",
+        "name": " [ STA 06	  | SUU78 | BRU32   ] - 1x AN/ALQ-99 ICAP III Low Band Jamming Pod",
         "weight": 465.383,
     }
-    STA_06_SUU78_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod = {
+    STA_06_SUU78_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod_ = {
         "clsid": "{GROWLER_PYLON_06_CN_PD_1X_AWW-13}",
-        "name": " [ STA 06	  | SUU78 | BRU32 ] - 1x AN/AWW-13 Advanced Datalink Pod",
+        "name": " [ STA 06	  | SUU78 | BRU32   ] - 1x AN/AWW-13 Advanced Datalink Pod",
         "weight": 234.47,
     }
-    STA_06_SUU78_BRU32_1x_FPU_12_A_Fuel_Tank = {
+    STA_06_SUU78_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_ = {
         "clsid": "{GROWLER_PYLON_06_CN_FT_FPU-12_Fueltank}",
-        "name": " [ STA 06	  | SUU78 | BRU32 ] - 1x FPU-12/A Fuel Tank",
-        "weight": 1384.47,
+        "name": " [ STA 06	  | SUU78 | BRU32   ] - 1x FPU-12/A (480 GAL) Fuel Tank",
+        "weight": 1634.97,
     }
-    STA_06_SUU78_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = {
+    STA_06_SUU78_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis_ = {
         "clsid": "{GROWLER_PYLON_06_CN_FT_FPU-12_FueltankHighVis}",
-        "name": " [ STA 06	  | SUU78 | BRU32 ] - 1x FPU-12/A Fuel Tank - High Vis",
-        "weight": 1384.47,
+        "name": " [ STA 06	  | SUU78 | BRU32   ] - 1x FPU-12/A (480 GAL) Fuel Tank - High Vis",
+        "weight": 1634.97,
     }
-    STA_06_SUU78_EMPTY_ = {
+    STA_06_SUU78_EMPTY = {
         "clsid": "{GROWLER_PYLON_06_CN_EMPTY}",
         "name": " [ STA 06	  | SUU78 | EMPTY ]",
         "weight": 0,
     }
-    STA_07_LA116_LA116_Empty_AIM_7_120_Ejectors = {
+    STA_07_LA116_LAU116_Empty_AIM_7_120_Ejectors = {
         "clsid": "{GROWLER_PYLON_07_CN_EMPTY}",
-        "name": " [ STA 07	  | LA116 | LA116 ] Empty AIM-7/120 Ejectors",
+        "name": " [ STA 07	  | LA116 | LAU116 ] Empty AIM-7/120 Ejectors",
         "weight": 0,
     }
-    STA_07_LA116_LA116_1x_AIM_120B_AMRAAM___Active_Radar_AAM = {
+    STA_07_LA116_LAU116_1x_AIM_120B_AMRAAM___Active_Radar_AAM = {
         "clsid": "{GROWLER_PYLON_07_AM_1X_AIM-120}",
-        "name": " [ STA 07	  | LA116 | LA116 ] - 1x AIM-120B AMRAAM - Active Radar AAM",
+        "name": " [ STA 07	  | LA116 | LAU116 ] - 1x AIM-120B AMRAAM - Active Radar AAM",
         "weight": 157.85,
     }
-    STA_07_LA116_LA116_1x_AIM_120C_AMRAAM___Active_Radar_AAM = {
+    STA_07_LA116_LAU116_1x_AIM_120C_AMRAAM___Active_Radar_AAM = {
         "clsid": "{GROWLER_PYLON_07_AM_1X_AIM-120C}",
-        "name": " [ STA 07	  | LA116 | LA116 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
+        "name": " [ STA 07	  | LA116 | LAU116 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 161.48,
     }
-    STA_07_LA116_LA116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_07_LA116_LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = {
         "clsid": "{GROWLER_PYLON_07_AM_1X_AIM-120D}",
-        "name": " [ STA 07	  | LA116 | LA116 ] - 1x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 07	  | LA116 | LAU116 ] - 1x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 162.4,
     }
-    STA_07_LA116_LA116_1x_AIM_7F_Sparrow_Semi_Active_Radar = {
+    STA_07_LA116_LAU116_1x_AIM_7F_Sparrow_Semi_Active_Radar = {
         "clsid": "{GROWLER_PYLON_07_SP_1X_AIM-7F}",
-        "name": " [ STA 07	  | LA116 | LA116 ] - 1x AIM-7F Sparrow Semi-Active Radar",
+        "name": " [ STA 07	  | LA116 | LAU116 ] - 1x AIM-7F Sparrow Semi-Active Radar",
         "weight": 231,
     }
-    STA_07_LA116_LA116_1x_AIM_7MH_Sparrow_Semi_Active_Radar = {
+    STA_07_LA116_LAU116_1x_AIM_7MH_Sparrow_Semi_Active_Radar = {
         "clsid": "{GROWLER_PYLON_07_SP_1X_AIM-7H}",
-        "name": " [ STA 07	  | LA116 | LA116 ] - 1x AIM-7MH Sparrow Semi-Active Radar",
+        "name": " [ STA 07	  | LA116 | LAU116 ] - 1x AIM-7MH Sparrow Semi-Active Radar",
         "weight": 231,
     }
-    STA_07_LA116_LA116_1x_AIM_7M_Sparrow_Semi_Active_Radar = {
+    STA_07_LA116_LAU116_1x_AIM_7M_Sparrow_Semi_Active_Radar = {
         "clsid": "{GROWLER_PYLON_07_SP_1X_AIM-7M}",
-        "name": " [ STA 07	  | LA116 | LA116 ] - 1x AIM-7M Sparrow Semi-Active Radar",
+        "name": " [ STA 07	  | LA116 | LAU116 ] - 1x AIM-7M Sparrow Semi-Active Radar",
         "weight": 231,
     }
-    STA_07_LA116_LA116_1x_AIM_7P_Sparrow_Semi_Active_Radar = {
+    STA_07_LA116_LAU116_1x_AIM_7P_Sparrow_Semi_Active_Radar = {
         "clsid": "{GROWLER_PYLON_07_SP_1X_AIM-7P}",
-        "name": " [ STA 07	  | LA116 | LA116 ] - 1x AIM-7P Sparrow Semi-Active Radar",
+        "name": " [ STA 07	  | LA116 | LAU116 ] - 1x AIM-7P Sparrow Semi-Active Radar",
         "weight": 231,
     }
-    STA_08_SUU79_BRU32_1x_AGM_154A___JSOW_CEB__CBU_type_ = {
+    STA_08_SUU79_BRU32_1x_AGM_154A___JSOW_CEB__CBU_type__ = {
         "clsid": "{GROWLER_PYLON_08_IB_JS_1X_AGM-154A}",
-        "name": " [ STA 08	  | SUU79 | BRU32 ] - 1x AGM-154A - JSOW CEB (CBU-type)",
+        "name": " [ STA 08	  | SUU79 | BRU32   ] - 1x AGM-154A - JSOW CEB (CBU-type)",
         "weight": 519.47,
     }
-    STA_08_SUU79_BRU32_1x_AGM_154C___JSOW_Unitary_BROACH = {
+    STA_08_SUU79_BRU32_1x_AGM_154C___JSOW_Unitary_BROACH_ = {
         "clsid": "{GROWLER_PYLON_08_IB_JS_1X_AGM-154C}",
-        "name": " [ STA 08	  | SUU79 | BRU32 ] - 1x AGM-154C - JSOW Unitary BROACH",
+        "name": " [ STA 08	  | SUU79 | BRU32   ] - 1x AGM-154C - JSOW Unitary BROACH",
         "weight": 518.47,
     }
-    STA_08_SUU79_BRU55_1x_AGM_154A___JSOW_CEB__CBU_type_ = {
+    STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank__ = {
+        "clsid": "{GROWLER_PYLON_08_IB_FT_FPU-12_Fueltank}",
+        "name": " [ STA 08	  | SUU79 | BRU32   ] - 1x FPU-12/A (480 GAL) Fuel Tank",
+        "weight": 1656.97,
+    }
+    STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis__ = {
+        "clsid": "{GROWLER_PYLON_08_IB_FT_FPU-12_FueltankHighVis}",
+        "name": " [ STA 08	  | SUU79 | BRU32   ] - 1x FPU-12/A (480 GAL) Fuel Tank - High Vis",
+        "weight": 1656.97,
+    }
+    STA_08_SUU79_BRU55_1x_AGM_154A___JSOW_CEB__CBU_type__ = {
         "clsid": "{GROWLER_PYLON_08_IB_JS_1X_BRU_AGM-154A}",
-        "name": " [ STA 08	  | SUU79 | BRU55 ] - 1x AGM-154A - JSOW CEB (CBU-type)",
+        "name": " [ STA 08	  | SUU79 | BRU55   ] - 1x AGM-154A - JSOW CEB (CBU-type)",
         "weight": 606.97,
     }
-    STA_08_SUU79_BRU55_1x_AGM_154C___JSOW_Unitary_BROACH = {
+    STA_08_SUU79_BRU55_1x_AGM_154C___JSOW_Unitary_BROACH_ = {
         "clsid": "{GROWLER_PYLON_08_IB_JS_1X_BRU_AGM-154C}",
-        "name": " [ STA 08	  | SUU79 | BRU55 ] - 1x AGM-154C - JSOW Unitary BROACH",
+        "name": " [ STA 08	  | SUU79 | BRU55   ] - 1x AGM-154C - JSOW Unitary BROACH",
         "weight": 605.97,
     }
-    STA_08_SUU79_BRU55_2x_AGM_154A___JSOW_CEB__CBU_type_ = {
+    STA_08_SUU79_BRU55_2x_AGM_154A___JSOW_CEB__CBU_type__ = {
         "clsid": "{GROWLER_PYLON_08_IB_JS_2X_BRU_AGM-154A}",
-        "name": " [ STA 08	  | SUU79 | BRU55 ] - 2x AGM-154A - JSOW CEB (CBU-type)",
+        "name": " [ STA 08	  | SUU79 | BRU55   ] - 2x AGM-154A - JSOW CEB (CBU-type)",
         "weight": 1091.97,
     }
-    STA_08_SUU79_BRU55_2x_AGM_154C___JSOW_Unitary_BROACH = {
+    STA_08_SUU79_BRU55_2x_AGM_154C___JSOW_Unitary_BROACH_ = {
         "clsid": "{GROWLER_PYLON_08_IB_JS_2X_BRU_AGM-154C}",
-        "name": " [ STA 08	  | SUU79 | BRU55 ] - 2x AGM-154C - JSOW Unitary BROACH",
+        "name": " [ STA 08	  | SUU79 | BRU55   ] - 2x AGM-154C - JSOW Unitary BROACH",
         "weight": 1089.97,
     }
-    STA_08_SUU79_LA127_1x_AIM_120B_AMRAAM___Active_Radar_AAM = {
+    STA_08_SUU79_LAU127_1x_AIM_120B_AMRAAM___Active_Radar_AAM_ = {
         "clsid": "{GROWLER_PYLON_08_IB_AM_1X_AIM-120}",
-        "name": " [ STA 08	  | SUU79 | LA127 ] - 1x AIM-120B AMRAAM - Active Radar AAM",
+        "name": " [ STA 08	  | SUU79 | LAU127 ] - 1x AIM-120B AMRAAM - Active Radar AAM",
         "weight": 337.32,
     }
-    STA_08_SUU79_LA127_1x_AIM_120C_AMRAAM___Active_Radar_AAM = {
+    STA_08_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM_ = {
         "clsid": "{GROWLER_PYLON_08_IB_AM_1X_AIM-120C}",
-        "name": " [ STA 08	  | SUU79 | LA127 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
+        "name": " [ STA 08	  | SUU79 | LAU127 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 340.95,
     }
-    STA_08_SUU79_LA127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = {
         "clsid": "{GROWLER_PYLON_08_IB_AM_1X_AIM-120D}",
-        "name": " [ STA 08	  | SUU79 | LA127 ] - 1x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 08	  | SUU79 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 341.87,
     }
-    STA_08_SUU79_LA127_1x_AIM_9M_Sidewinder_IR_AAM = {
+    STA_08_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM_ = {
         "clsid": "{GROWLER_PYLON_08_IB_SW_1X_AIM-9}",
-        "name": " [ STA 08	  | SUU79 | LA127 ] - 1x AIM-9M Sidewinder IR AAM",
+        "name": " [ STA 08	  | SUU79 | LAU127 ] - 1x AIM-9M Sidewinder IR AAM",
         "weight": 265.19,
     }
-    STA_08_SUU79_LA127_1x_AIM_9X_Sidewinder_IR_AAM = {
+    STA_08_SUU79_LAU127_1x_AIM_9X_Sidewinder_IR_AAM_ = {
         "clsid": "{GROWLER_PYLON_08_IB_SW_1X_AIM-9X}",
-        "name": " [ STA 08	  | SUU79 | LA127 ] - 1x AIM-9X Sidewinder IR AAM",
+        "name": " [ STA 08	  | SUU79 | LAU127 ] - 1x AIM-9X Sidewinder IR AAM",
         "weight": 263.93,
     }
-    STA_08_SUU79_LA127_1x_Captive_AIM_9M_for_ACM = {
+    STA_08_SUU79_LAU127_1x_Captive_AIM_9M_for_ACM_ = {
         "clsid": "{GROWLER_PYLON_08_IB_SW_1X_CATM-9M}",
-        "name": " [ STA 08	  | SUU79 | LA127 ] - 1x Captive AIM-9M for ACM",
+        "name": " [ STA 08	  | SUU79 | LAU127 ] - 1x Captive AIM-9M for ACM",
         "weight": 265.2,
     }
-    STA_08_SUU79_LA127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X = {
+    STA_08_SUU79_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X_ = {
         "clsid": "{GROWLER_PYLON_08_IB_LAU127}",
-        "name": " [ STA 08	  | SUU79 | LA127 ] - 1x Marvin LAU-127 Rail Launcher for AIM-120B/C/D and AIM9L/M/X",
+        "name": " [ STA 08	  | SUU79 | LAU127 ] - 1x Marvin LAU-127 Rail Launcher for AIM-120B/C/D and AIM9L/M/X",
         "weight": 52.1,
     }
-    STA_08_SUU79_LA127_2x_AIM_120B_AMRAAM___Active_Radar_AAM = {
+    STA_08_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM_ = {
         "clsid": "{GROWLER_PYLON_08_IB_AM_2X_AIM-120}",
-        "name": " [ STA 08	  | SUU79 | LA127 ] - 2x AIM-120B AMRAAM - Active Radar AAM",
+        "name": " [ STA 08	  | SUU79 | LAU127 ] - 2x AIM-120B AMRAAM - Active Radar AAM",
         "weight": 495.17,
     }
-    STA_08_SUU79_LA127_2x_AIM_120C_AMRAAM___Active_Radar_AAM = {
+    STA_08_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM_ = {
         "clsid": "{GROWLER_PYLON_08_IB_AM_2X_AIM-120C}",
-        "name": " [ STA 08	  | SUU79 | LA127 ] - 2x AIM-120C AMRAAM - Active Radar AAM",
+        "name": " [ STA 08	  | SUU79 | LAU127 ] - 2x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 502.43,
     }
-    STA_08_SUU79_LA127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = {
         "clsid": "{GROWLER_PYLON_08_IB_AM_2X_AIM-120D}",
-        "name": " [ STA 08	  | SUU79 | LA127 ] - 2x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 08	  | SUU79 | LAU127 ] - 2x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 504.27,
     }
-    STA_08_SUU79_LA127_2x_AIM_9M_Sidewinder_IR_AAM = {
+    STA_08_SUU79_LAU127_2x_AIM_9M_Sidewinder_IR_AAM_ = {
         "clsid": "{GROWLER_PYLON_08_IB_SW_2X_AIM-9}",
-        "name": " [ STA 08	  | SUU79 | LA127 ] - 2x AIM-9M Sidewinder IR AAM",
+        "name": " [ STA 08	  | SUU79 | LAU127 ] - 2x AIM-9M Sidewinder IR AAM",
         "weight": 350.91,
     }
-    STA_08_SUU79_LA127_2x_AIM_9X_Sidewinder_IR_AAM = {
+    STA_08_SUU79_LAU127_2x_AIM_9X_Sidewinder_IR_AAM_ = {
         "clsid": "{GROWLER_PYLON_08_IB_SW_2X_AIM-9X}",
-        "name": " [ STA 08	  | SUU79 | LA127 ] - 2x AIM-9X Sidewinder IR AAM",
+        "name": " [ STA 08	  | SUU79 | LAU127 ] - 2x AIM-9X Sidewinder IR AAM",
         "weight": 348.39,
     }
-    STA_08_SUU79_LA127_2x_Captive_AIM_9M_for_ACM = {
+    STA_08_SUU79_LAU127_2x_Captive_AIM_9M_for_ACM_ = {
         "clsid": "{GROWLER_PYLON_08_IB_SW_2X_CATM-9M}",
-        "name": " [ STA 08	  | SUU79 | LA127 ] - 2x Captive AIM-9M for ACM",
+        "name": " [ STA 08	  | SUU79 | LAU127 ] - 2x Captive AIM-9M for ACM",
         "weight": 350.93,
     }
-    STA_08_SUU80_LA118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = {
+    STA_08_SUU80_LAU118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = {
         "clsid": "{GROWLER_PYLON_08_IB_AR_1X_AGM-88}",
-        "name": " [ STA 08	  | SUU80 | LA118 ] - 1x AGM-88C HARM - High Speed Anti-Radiation Missile",
+        "name": " [ STA 08	  | SUU80 | LAU118 ] - 1x AGM-88C HARM - High Speed Anti-Radiation Missile",
         "weight": 440.87,
     }
     STA_09_SUU79_BRU32_1x_AN_ALQ_249_Mid_Band_Next_Generation_Jamming_Pod = {
         "clsid": "{GROWLER_PYLON_09_MB_ALQ_249_MID_BAND}",
-        "name": " [ STA 09	  | SUU79 | BRU32 ] - 1x AN/ALQ-249 Mid Band Next Generation Jamming Pod",
+        "name": " [ STA 09	  | SUU79 | BRU32   ] - 1x AN/ALQ-249 Mid Band Next Generation Jamming Pod",
         "weight": 465.383,
     }
     STA_09_SUU79_BRU32_1x_AN_ALQ_99_ICAP_III_High_Band_Jamming_Pod = {
         "clsid": "{GROWLER_PYLON_09_MB_ALQ_99_HI_BAND}",
-        "name": " [ STA 09	  | SUU79 | BRU32 ] - 1x AN/ALQ-99 ICAP III High Band Jamming Pod",
+        "name": " [ STA 09	  | SUU79 | BRU32   ] - 1x AN/ALQ-99 ICAP III High Band Jamming Pod",
         "weight": 465.383,
     }
-    STA_09_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = {
+    STA_09_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_ = {
         "clsid": "{GROWLER_PYLON_10_MB_FT_FPU-12_Fueltank}",
-        "name": " [ STA 09	  | SUU79 | BRU32 ] - 1x FPU-12/A Fuel Tank",
-        "weight": 1384.47,
+        "name": " [ STA 09	  | SUU79 | BRU32   ] - 1x FPU-12/A (480 GAL) Fuel Tank",
+        "weight": 1634.97,
     }
-    STA_09_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = {
+    STA_09_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis_ = {
         "clsid": "{GROWLER_PYLON_10_MB_FT_FPU-12_FueltankHighVis}",
-        "name": " [ STA 09	  | SUU79 | BRU32 ] - 1x FPU-12/A Fuel Tank - High Vis",
-        "weight": 1384.47,
+        "name": " [ STA 09	  | SUU79 | BRU32   ] - 1x FPU-12/A (480 GAL) Fuel Tank - High Vis",
+        "weight": 1634.97,
     }
-    STA_09_SUU79_LA118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = {
+    STA_09_SUU79_LAU118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_ = {
         "clsid": "{GROWLER_PYLON_10_MB_AR_1X_AGM-88}",
-        "name": " [ STA 09	  | SUU79 | LA118 ] - 1x AGM-88C HARM - High Speed Anti-Radiation Missile",
+        "name": " [ STA 09	  | SUU79 | LAU118 ] - 1x AGM-88C HARM - High Speed Anti-Radiation Missile",
         "weight": 440.87,
     }
-    STA_09_SUU79_LA127_1x_AIM_120B_AMRAAM___Active_Radar_AAM = {
+    STA_09_SUU79_LAU127_1x_AIM_120B_AMRAAM___Active_Radar_AAM__ = {
         "clsid": "{GROWLER_PYLON_10_MB_AM_1X_AIM-120}",
-        "name": " [ STA 09	  | SUU79 | LA127 ] - 1x AIM-120B AMRAAM - Active Radar AAM",
+        "name": " [ STA 09	  | SUU79 | LAU127 ] - 1x AIM-120B AMRAAM - Active Radar AAM",
         "weight": 337.32,
     }
-    STA_09_SUU79_LA127_1x_AIM_120C_AMRAAM___Active_Radar_AAM = {
+    STA_09_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM__ = {
         "clsid": "{GROWLER_PYLON_10_MB_AM_1X_AIM-120C}",
-        "name": " [ STA 09	  | SUU79 | LA127 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
+        "name": " [ STA 09	  | SUU79 | LAU127 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 340.95,
     }
-    STA_09_SUU79_LA127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only___ = {
         "clsid": "{GROWLER_PYLON_10_MB_AM_1X_AIM-120D}",
-        "name": " [ STA 09	  | SUU79 | LA127 ] - 1x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 09	  | SUU79 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 341.87,
     }
-    STA_09_SUU79_LA127_1x_AIM_9M_Sidewinder_IR_AAM = {
+    STA_09_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM__ = {
         "clsid": "{GROWLER_PYLON_10_MB_SW_1X_AIM-9}",
-        "name": " [ STA 09	  | SUU79 | LA127 ] - 1x AIM-9M Sidewinder IR AAM",
+        "name": " [ STA 09	  | SUU79 | LAU127 ] - 1x AIM-9M Sidewinder IR AAM",
         "weight": 265.19,
     }
-    STA_09_SUU79_LA127_1x_AIM_9X_Sidewinder_IR_AAM = {
+    STA_09_SUU79_LAU127_1x_AIM_9X_Sidewinder_IR_AAM__ = {
         "clsid": "{GROWLER_PYLON_10_MB_SW_1X_AIM-9X}",
-        "name": " [ STA 09	  | SUU79 | LA127 ] - 1x AIM-9X Sidewinder IR AAM",
+        "name": " [ STA 09	  | SUU79 | LAU127 ] - 1x AIM-9X Sidewinder IR AAM",
         "weight": 263.93,
     }
-    STA_09_SUU79_LA127_1x_Captive_AIM_9M_for_ACM = {
+    STA_09_SUU79_LAU127_1x_Captive_AIM_9M_for_ACM__ = {
         "clsid": "{GROWLER_PYLON_10_MB_SW_1X_CATM-9M}",
-        "name": " [ STA 09	  | SUU79 | LA127 ] - 1x Captive AIM-9M for ACM",
+        "name": " [ STA 09	  | SUU79 | LAU127 ] - 1x Captive AIM-9M for ACM",
         "weight": 265.2,
     }
-    STA_09_SUU79_LA127_2x_AIM_120B_AMRAAM___Active_Radar_AAM = {
+    STA_09_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM__ = {
         "clsid": "{GROWLER_PYLON_10_MB_AM_2X_AIM-120}",
-        "name": " [ STA 09	  | SUU79 | LA127 ] - 2x AIM-120B AMRAAM - Active Radar AAM",
+        "name": " [ STA 09	  | SUU79 | LAU127 ] - 2x AIM-120B AMRAAM - Active Radar AAM",
         "weight": 495.17,
     }
-    STA_09_SUU79_LA127_2x_AIM_120C_AMRAAM___Active_Radar_AAM = {
+    STA_09_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM__ = {
         "clsid": "{GROWLER_PYLON_10_MB_AM_2X_AIM-120C}",
-        "name": " [ STA 09	  | SUU79 | LA127 ] - 2x AIM-120C AMRAAM - Active Radar AAM",
+        "name": " [ STA 09	  | SUU79 | LAU127 ] - 2x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 502.43,
     }
-    STA_09_SUU79_LA127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only___ = {
         "clsid": "{GROWLER_PYLON_10_MB_AM_2X_AIM-120D}",
-        "name": " [ STA 09	  | SUU79 | LA127 ] - 2x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 09	  | SUU79 | LAU127 ] - 2x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 504.27,
     }
-    STA_09_SUU79_LA127_2x_AIM_9M_Sidewinder_IR_AAM = {
+    STA_09_SUU79_LAU127_2x_AIM_9M_Sidewinder_IR_AAM__ = {
         "clsid": "{GROWLER_PYLON_10_MB_SW_2X_AIM-9}",
-        "name": " [ STA 09	  | SUU79 | LA127 ] - 2x AIM-9M Sidewinder IR AAM",
+        "name": " [ STA 09	  | SUU79 | LAU127 ] - 2x AIM-9M Sidewinder IR AAM",
         "weight": 350.91,
     }
-    STA_09_SUU79_LA127_2x_AIM_9X_Sidewinder_IR_AAM = {
+    STA_09_SUU79_LAU127_2x_AIM_9X_Sidewinder_IR_AAM__ = {
         "clsid": "{GROWLER_PYLON_10_MB_SW_2X_AIM-9X}",
-        "name": " [ STA 09	  | SUU79 | LA127 ] - 2x AIM-9X Sidewinder IR AAM",
+        "name": " [ STA 09	  | SUU79 | LAU127 ] - 2x AIM-9X Sidewinder IR AAM",
         "weight": 348.39,
     }
-    STA_09_SUU79_LA127_2x_Captive_AIM_9M_for_ACM = {
+    STA_09_SUU79_LAU127_2x_Captive_AIM_9M_for_ACM__ = {
         "clsid": "{GROWLER_PYLON_10_MB_SW_2X_CATM-9M}",
-        "name": " [ STA 09	  | SUU79 | LA127 ] - 2x Captive AIM-9M for ACM",
+        "name": " [ STA 09	  | SUU79 | LAU127 ] - 2x Captive AIM-9M for ACM",
         "weight": 350.93,
     }
-    STA_09_SUU80_LA127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X = {
+    STA_09_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X = {
         "clsid": "{GROWLER_PYLON_09_IB_LAU127}",
-        "name": " [ STA 09	  | SUU80 | LA127 ] - 1x Marvin LAU-127 Rail Launcher for AIM-120B/C/D and AIM9L/M/X",
+        "name": " [ STA 09	  | SUU80 | LAU127 ] - 1x Marvin LAU-127 Rail Launcher for AIM-120B/C/D and AIM9L/M/X",
         "weight": 52.1,
     }
-    STA_10_SUU80_LA115_1x_AIM_7F_Sparrow_Semi_Active_Radar = {
+    STA_10_SUU80_LAU115_1x_AIM_7F_Sparrow_Semi_Active_Radar_ = {
         "clsid": "{GROWLER_PYLON_10_SP_1X_AIM-7F}",
-        "name": " [ STA 10	  | SUU80 | LA115 ] - 1x AIM-7F Sparrow Semi-Active Radar",
+        "name": " [ STA 10	  | SUU80 | LAU115 ] - 1x AIM-7F Sparrow Semi-Active Radar",
         "weight": 319.87,
     }
-    STA_10_SUU80_LA115_1x_AIM_7MH_Sparrow_Semi_Active_Radar = {
+    STA_10_SUU80_LAU115_1x_AIM_7MH_Sparrow_Semi_Active_Radar_ = {
         "clsid": "{GROWLER_PYLON_10_SP_1X_AIM-7H}",
-        "name": " [ STA 10	  | SUU80 | LA115 ] - 1x AIM-7MH Sparrow Semi-Active Radar",
+        "name": " [ STA 10	  | SUU80 | LAU115 ] - 1x AIM-7MH Sparrow Semi-Active Radar",
         "weight": 319.87,
     }
-    STA_10_SUU80_LA115_1x_AIM_7M_Sparrow_Semi_Active_Radar = {
+    STA_10_SUU80_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar_ = {
         "clsid": "{GROWLER_PYLON_10_SP_1X_AIM-7M}",
-        "name": " [ STA 10	  | SUU80 | LA115 ] - 1x AIM-7M Sparrow Semi-Active Radar",
+        "name": " [ STA 10	  | SUU80 | LAU115 ] - 1x AIM-7M Sparrow Semi-Active Radar",
         "weight": 319.87,
     }
-    STA_10_SUU80_LA115_1x_AIM_7P_Sparrow_Semi_Active_Radar = {
+    STA_10_SUU80_LAU115_1x_AIM_7P_Sparrow_Semi_Active_Radar_ = {
         "clsid": "{GROWLER_PYLON_10_SP_1X_AIM-7P}",
-        "name": " [ STA 10	  | SUU80 | LA115 ] - 1x AIM-7P Sparrow Semi-Active Radar",
+        "name": " [ STA 10	  | SUU80 | LAU115 ] - 1x AIM-7P Sparrow Semi-Active Radar",
         "weight": 319.87,
     }
-    STA_10_SUU80_LA118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = {
+    STA_10_SUU80_LAU118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_ = {
         "clsid": "{GROWLER_PYLON_10_OB_AR_1X_AGM-88}",
-        "name": " [ STA 10	  | SUU80 | LA118 ] - 1x AGM-88C HARM - High Speed Anti-Radiation Missile",
+        "name": " [ STA 10	  | SUU80 | LAU118 ] - 1x AGM-88C HARM - High Speed Anti-Radiation Missile",
         "weight": 440.87,
     }
-    STA_10_SUU80_LA127_1x_AIM_120B_AMRAAM___Active_Radar_AAM = {
+    STA_10_SUU80_LAU127_1x_AIM_120B_AMRAAM___Active_Radar_AAM_ = {
         "clsid": "{GROWLER_PYLON_10_OB_AM_1X_AIM-120}",
-        "name": " [ STA 10	  | SUU80 | LA127 ] - 1x AIM-120B AMRAAM - Active Radar AAM",
+        "name": " [ STA 10	  | SUU80 | LAU127 ] - 1x AIM-120B AMRAAM - Active Radar AAM",
         "weight": 337.32,
     }
-    STA_10_SUU80_LA127_1x_AIM_120C_AMRAAM___Active_Radar_AAM = {
+    STA_10_SUU80_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM_ = {
         "clsid": "{GROWLER_PYLON_10_OB_AM_1X_AIM-120C}",
-        "name": " [ STA 10	  | SUU80 | LA127 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
+        "name": " [ STA 10	  | SUU80 | LAU127 ] - 1x AIM-120C AMRAAM - Active Radar AAM",
         "weight": 340.95,
     }
-    STA_10_SUU80_LA127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = {
+    STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = {
         "clsid": "{GROWLER_PYLON_10_OB_AM_1X_AIM-120D}",
-        "name": " [ STA 10	  | SUU80 | LA127 ] - 1x AIM-120D AMRAAM - Active Radar AAM (AI Only)",
+        "name": " [ STA 10	  | SUU80 | LAU127 ] - 1x AIM-120D AMRAAM - Active Radar AAM, (AI Only)",
         "weight": 341.87,
     }
-    STA_10_SUU80_LA127_1x_AIM_9M_Sidewinder_IR_AAM = {
+    STA_10_SUU80_LAU127_1x_AIM_9M_Sidewinder_IR_AAM_ = {
         "clsid": "{GROWLER_PYLON_09_OB_SW_1X_AIM-9}",
-        "name": " [ STA 10	  | SUU80 | LA127 ] - 1x AIM-9M Sidewinder IR AAM",
+        "name": " [ STA 10	  | SUU80 | LAU127 ] - 1x AIM-9M Sidewinder IR AAM",
         "weight": 137.82,
     }
-    STA_10_SUU80_LA127_1x_AIM_9M_Sidewinder_IR_AAM_ = {
+    STA_10_SUU80_LAU127_1x_AIM_9M_Sidewinder_IR_AAM__ = {
         "clsid": "{GROWLER_PYLON_10_OB_SW_1X_AIM-9}",
-        "name": " [ STA 10	  | SUU80 | LA127 ] - 1x AIM-9M Sidewinder IR AAM",
+        "name": " [ STA 10	  | SUU80 | LAU127 ] - 1x AIM-9M Sidewinder IR AAM",
         "weight": 265.19,
     }
-    STA_10_SUU80_LA127_1x_AIM_9X_Sidewinder_IR_AAM = {
+    STA_10_SUU80_LAU127_1x_AIM_9X_Sidewinder_IR_AAM_ = {
         "clsid": "{GROWLER_PYLON_09_OB_SW_1X_AIM-9X}",
-        "name": " [ STA 10	  | SUU80 | LA127 ] - 1x AIM-9X Sidewinder IR AAM",
+        "name": " [ STA 10	  | SUU80 | LAU127 ] - 1x AIM-9X Sidewinder IR AAM",
         "weight": 136.56,
     }
-    STA_10_SUU80_LA127_1x_AIM_9X_Sidewinder_IR_AAM_ = {
+    STA_10_SUU80_LAU127_1x_AIM_9X_Sidewinder_IR_AAM__ = {
         "clsid": "{GROWLER_PYLON_10_OB_SW_1X_AIM-9X}",
-        "name": " [ STA 10	  | SUU80 | LA127 ] - 1x AIM-9X Sidewinder IR AAM",
+        "name": " [ STA 10	  | SUU80 | LAU127 ] - 1x AIM-9X Sidewinder IR AAM",
         "weight": 263.93,
     }
-    STA_10_SUU80_LA127_1x_AN_ASQ_T50_V_1_TCTS_Pod = {
+    STA_10_SUU80_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod_ = {
         "clsid": "{GROWLER_PYLON_10_PD_ais-pod-t50}",
-        "name": " [ STA 10	  | SUU80 | LA127 ] - 1x AN/ASQ-T50(V)1 TCTS Pod",
+        "name": " [ STA 10	  | SUU80 | LAU127 ] - 1x AN/ASQ-T50(V)1 TCTS Pod",
         "weight": 114.7,
     }
-    STA_10_SUU80_LA127_1x_Captive_AIM_9M_for_ACM = {
+    STA_10_SUU80_LAU127_1x_Captive_AIM_9M_for_ACM_ = {
         "clsid": "{GROWLER_PYLON_10_OB_SW_1X_C}",
-        "name": " [ STA 10	  | SUU80 | LA127 ] - 1x Captive AIM-9M for ACM",
+        "name": " [ STA 10	  | SUU80 | LAU127 ] - 1x Captive AIM-9M for ACM",
         "weight": 265.2,
     }
-    STA_10_SUU80_LA127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X = {
+    STA_10_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X_ = {
         "clsid": "{GROWLER_PYLON_09_OB_LAU127}",
-        "name": " [ STA 10	  | SUU80 | LA127 ] - 1x Marvin LAU-127 Rail Launcher for AIM-120B/C/D and AIM9L/M/X",
+        "name": " [ STA 10	  | SUU80 | LAU127 ] - 1x Marvin LAU-127 Rail Launcher for AIM-120B/C/D and AIM9L/M/X",
         "weight": 52.1,
     }
-    STA_10_SUU80_LA127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X_ = {
+    STA_10_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X__ = {
         "clsid": "{GROWLER_PYLON_10_LAU127}",
-        "name": " [ STA 10	  | SUU80 | LA127 ] - 1x Marvin LAU-127 Rail Launcher for AIM-120B/C/D and AIM9L/M/X",
+        "name": " [ STA 10	  | SUU80 | LAU127 ] - 1x Marvin LAU-127 Rail Launcher for AIM-120B/C/D and AIM9L/M/X",
         "weight": 52.1,
     }
+    STA_AX_AUX_PILOT_1x_Hood_Displayed_Folded_Flag_ = {
+        "clsid": "{GROWLER_PYLON_XX_CN_HOOD_FLAG}",
+        "name": " [ STA AX	  | AUX	 | PILOT ] - 1x Hood Displayed Folded Flag",
+        "weight": 0,
+    }
 
 
 inject_weapons(WeaponsFA18EF)
@@ -3642,14 +3902,20 @@ class FA_18E(PlaneType):
         "USA_FLAG": False,
         "BlockIIIEquip": True,
         "HelmetMountedDevice": 1,
-        "RemoveLOutboard": False,
-        "RemoveLMidboard": False,
-        "RemoveLInboard": False,
-        "RemoveRInboard": False,
-        "RemoveRMidboard": False,
-        "RemoveROutboard": False,
+        "RemoveLOutboard": True,
+        "RemoveLMidboard": True,
+        "RemoveLInboard": True,
+        "RemoveLCheek": True,
+        "RemoveCenter": True,
+        "RemoveRCheek": True,
+        "RemoveRInboard": True,
+        "RemoveRMidboard": True,
+        "RemoveROutboard": True,
         "OuterBoard": 0,
         "InnerBoard": 0,
+        "VoiceCallsignLabel": None,
+        "VoiceCallsignNumber": None,
+        "STN_L16": None,
         "DYNAMIC_BORTS_MODE": 0,
         "DYNAMIC_BUNOS": False,
         "DYNAMIC_BUNO_01": 10,
@@ -3700,6 +3966,15 @@ class FA_18E(PlaneType):
         class RemoveLInboard:
             id = "RemoveLInboard"
 
+        class RemoveLCheek:
+            id = "RemoveLCheek"
+
+        class RemoveCenter:
+            id = "RemoveCenter"
+
+        class RemoveRCheek:
+            id = "RemoveRCheek"
+
         class RemoveRInboard:
             id = "RemoveRInboard"
 
@@ -3723,6 +3998,15 @@ class FA_18E(PlaneType):
                 Single = 0
                 Ripple = 1
 
+        class VoiceCallsignLabel:
+            id = "VoiceCallsignLabel"
+
+        class VoiceCallsignNumber:
+            id = "VoiceCallsignNumber"
+
+        class STN_L16:
+            id = "STN_L16"
+
         class DYNAMIC_BORTS_MODE:
             id = "DYNAMIC_BORTS_MODE"
 
@@ -3834,41 +4118,48 @@ class FA_18E(PlaneType):
                 Blank = 10
 
     properties = {
-        "DemoEquipment": UnitPropertyDescription(
-            identifier="DemoEquipment",
-            control="comboList",
-            label="Demonstration Team Equipment",
+        "EQUIPMENT_Label": UnitPropertyDescription(
+            identifier="EQUIPMENT_Label",
+            control="label",
+            label="Aircraft / Pilot Equipment Settings",
             player_only=False,
+            x_lbl=100,
+        ),
+        "AIRCRAFT_ID_SEQ": UnitPropertyDescription(
+            identifier="AIRCRAFT_ID_SEQ",
+            control="comboList",
+            label="Aircraft Strobe Sequence",
+            player_only=True,
             default=0,
             w_ctrl=150,
             values={
-                0: "False",
-                1: "True",
+                0: "Norm",
+                1: "Pattern 0A",
+                2: "Pattern 1B",
+                3: "Pattern 2C",
+                4: "Pattern 3D",
+                5: "Pattern 4E",
+                6: "Pattern 5F",
             },
         ),
+        "DemoEquipment": UnitPropertyDescription(
+            identifier="DemoEquipment",
+            control="checkbox",
+            label="USN Demo Team Equipment",
+            default=False,
+            weight_when_on=-140.2,
+        ),
         "USA_FLAG": UnitPropertyDescription(
             identifier="USA_FLAG",
-            control="comboList",
+            control="checkbox",
             label="Hood Displayed USA Flag",
-            player_only=False,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            default=False,
         ),
         "BlockIIIEquip": UnitPropertyDescription(
             identifier="BlockIIIEquip",
-            control="comboList",
+            control="checkbox",
             label="Block III Antennas (Cosmetic)",
-            player_only=False,
-            default=1,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            default=True,
         ),
         "HelmetMountedDevice": UnitPropertyDescription(
             identifier="HelmetMountedDevice",
@@ -3883,77 +4174,89 @@ class FA_18E(PlaneType):
                 2: "NVG",
             },
         ),
+        "EQUIPMENT_Label": UnitPropertyDescription(
+            identifier="EQUIPMENT_Label",
+            control="label",
+            label="Additional Pylon Control",
+            player_only=False,
+            x_lbl=100,
+        ),
+        "EQUIPMENT_Label_USER": UnitPropertyDescription(
+            identifier="EQUIPMENT_Label_USER",
+            control="label",
+            label="*(User req. to remove stores)",
+            player_only=False,
+            x_lbl=100,
+        ),
         "RemoveLOutboard": UnitPropertyDescription(
             identifier="RemoveLOutboard",
-            control="comboList",
-            label="Dismount STA 2 SUU-80A Pylon (Left Outboard)",
-            player_only=False,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            control="checkbox",
+            label="Mount STA 2 SUU-80A Pylon",
+            default=True,
+            weight_when_on=55.79,
         ),
         "RemoveLMidboard": UnitPropertyDescription(
             identifier="RemoveLMidboard",
-            control="comboList",
-            label="Dismount STA 3 SUU-79A Pylon (Left Midboard)",
-            player_only=False,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            control="checkbox",
+            label="Mount STA 3 SUU-79A Pylon",
+            default=True,
+            weight_when_on=163.29,
         ),
         "RemoveLInboard": UnitPropertyDescription(
-            identifier="RemoveLMidboard",
-            control="comboList",
-            label="Dismount STA 4 SUU-79A Pylon (Left Inboard)",
-            player_only=False,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            identifier="RemoveLInboard",
+            control="checkbox",
+            label="Mount STA 4 SUU-79A Pylon",
+            default=True,
+            weight_when_on=163.29,
+        ),
+        "RemoveLCheek": UnitPropertyDescription(
+            identifier="RemoveLCheek",
+            control="checkbox",
+            label="Mount STA 5 LAU-115 Pylon",
+            default=True,
+            weight_when_on=30.84,
+        ),
+        "RemoveCenter": UnitPropertyDescription(
+            identifier="RemoveCenter",
+            control="checkbox",
+            label="Mount STA 6 SUU-78A Pylon",
+            default=True,
+            weight_when_on=83,
+        ),
+        "RemoveRCheek": UnitPropertyDescription(
+            identifier="RemoveRCheek",
+            control="checkbox",
+            label="Mount STA 7 LAU-115 Pylon",
+            default=True,
+            weight_when_on=30.84,
         ),
         "RemoveRInboard": UnitPropertyDescription(
             identifier="RemoveRInboard",
-            control="comboList",
-            label="Dismount STA 8 SUU-79A Pylon (Right Inboard)",
-            player_only=False,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            control="checkbox",
+            label="Mount STA 8 SUU-79A Pylon",
+            default=True,
+            weight_when_on=163.29,
         ),
         "RemoveRMidboard": UnitPropertyDescription(
-            identifier="RemoveRInboard",
-            control="comboList",
-            label="Dismount STA 9 SUU-79A Pylon (Right Midboard)",
-            player_only=False,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            identifier="RemoveRMidboard",
+            control="checkbox",
+            label="Mount STA 9 SUU-79A Pylon",
+            default=True,
+            weight_when_on=163.29,
         ),
         "RemoveROutboard": UnitPropertyDescription(
             identifier="RemoveROutboard",
-            control="comboList",
-            label="Dismount STA 10 SUU-80A Pylon (Right Outboard)",
-            player_only=False,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            control="checkbox",
+            label="Mount STA 10 SUU-80A Pylon",
+            default=True,
+            weight_when_on=55.79,
+        ),
+        "ROCKETS_Label": UnitPropertyDescription(
+            identifier="ROCKETS_Label",
+            control="label",
+            label="Aircraft Rocket Settings",
+            player_only=True,
+            x_lbl=100,
         ),
         "OuterBoard": UnitPropertyDescription(
             identifier="OuterBoard",
@@ -3982,9 +4285,9 @@ class FA_18E(PlaneType):
         "datalink_Label": UnitPropertyDescription(
             identifier="datalink_Label",
             control="label",
-            label="DATALINK",
+            label="Datalink Settings",
             player_only=False,
-            x_lbl=150,
+            x_lbl=100,
         ),
         "VoiceCallsignLabel": UnitPropertyDescription(
             identifier="VoiceCallsignLabel",
@@ -4004,6 +4307,161 @@ class FA_18E(PlaneType):
             label="STN",
             player_only=False,
         ),
+        "DYNAMIC_BORTS": UnitPropertyDescription(
+            identifier="DYNAMIC_BORTS",
+            control="label",
+            label="Aircraft Identification Stencils",
+            player_only=False,
+            x_lbl=100,
+        ),
+        "DYNAMIC_BORTS_MODE": UnitPropertyDescription(
+            identifier="DYNAMIC_BORTS_MODE",
+            control="comboList",
+            label="Aircraft Identification Type",
+            player_only=False,
+            default=0,
+            w_ctrl=150,
+            values={
+                0: "DISABLED / NONE",
+                1: "USN STANDARD",
+                2: "RAAF FIGHTER",
+                3: "RAAF GROWLER",
+                4: "KAF LEGACY",
+                5: "KAF SUPER HORNET",
+            },
+        ),
+        "DYNAMIC_BUNOS": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNOS",
+            control="checkbox",
+            label="Aircraft Identification BUNO",
+            default=False,
+        ),
+        "DYNAMIC_BUNO_01": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_01",
+            control="comboList",
+            label="Aircraft BUNO Digit #1",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_02": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_02",
+            control="comboList",
+            label="Aircraft BUNO Digit #2",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_03": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_03",
+            control="comboList",
+            label="Aircraft BUNO Digit #3",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_04": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_04",
+            control="comboList",
+            label="Aircraft BUNO Digit #4",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_05": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_05",
+            control="comboList",
+            label="Aircraft BUNO Digit #5",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_06": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_06",
+            control="comboList",
+            label="Aircraft BUNO Digit #6",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
     }
 
     livery_name = "FA-18E"  # from livery_entry
@@ -4025,6 +4483,10 @@ class FA_18E(PlaneType):
             1,
             WeaponsFA18EF.STA_01_WNGTP_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod,
         )
+        STA_01_WNGTP_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            1,
+            WeaponsFA18EF.STA_01_WNGTP_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
 
     class Pylon2:
         STA_02_SUU80_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar = (
@@ -4055,9 +4517,9 @@ class FA_18E(PlaneType):
             2,
             WeaponsFA18EF.STA_02_SUU80_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             2,
-            WeaponsFA18EF.STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_02_SUU80_LAU117_1x_AGM_65E___Maverick_E__Laser_ASM___Lg_Whd_ = (
             2,
@@ -4151,9 +4613,9 @@ class FA_18E(PlaneType):
             2,
             WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             2,
-            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_03_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             2,
@@ -4163,9 +4625,9 @@ class FA_18E(PlaneType):
             2,
             WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             2,
-            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_03_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM = (
             2,
@@ -4275,7 +4737,6 @@ class FA_18E(PlaneType):
             2,
             WeaponsFA18EF.STA_03_SUU79_BRU32_1x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
-        # ERRR {SUPERHORNET_PYLON_02_MB_MK_BR55_1X_GBU-38}
         STA_03_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             2,
             WeaponsFA18EF.STA_03_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
@@ -4300,89 +4761,115 @@ class FA_18E(PlaneType):
             2,
             WeaponsFA18EF.STA_03_SUU79_BRU33_2x_GBU_12___500lb_Laser_Guided_Bomb,
         )
-        STA_02_03_79_80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM = (
+        STA_02_03_79___80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM = (
             2,
-            WeaponsFA18EF.STA_02_03_79_80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM,
         )
-        STA_02_03_79_80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM = (
+        STA_02_03_79___80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM = (
             2,
-            WeaponsFA18EF.STA_02_03_79_80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM,
         )
-        STA_02_03_79_80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
+        STA_02_03_79___80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             2,
-            WeaponsFA18EF.STA_02_03_79_80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
         )
-        STA_02_03_79_80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
+        STA_02_03_79___80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
             2,
-            WeaponsFA18EF.STA_02_03_79_80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_02_03_79_80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_02_03_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             2,
-            WeaponsFA18EF.STA_02_03_79_80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
-        STA_03_02_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
+        STA_03_02_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
         )
-        STA_03_02_79_80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb = (
+        STA_03_02_79___80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb,
         )
-        STA_03_02_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
+        STA_03_02_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
         )
-        STA_03_02_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
+        STA_03_02_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
         )
-        STA_03_02_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+        STA_03_02_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
         )
-        STA_03_02_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
+        STA_03_02_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        STA_03_02_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
+        STA_03_02_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
-        STA_04_02_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
+        STA_04_02_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
             2,
-            WeaponsFA18EF.STA_04_02_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
+            WeaponsFA18EF.STA_04_02_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
         )
-        STA_04_02_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
+        STA_04_02_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             2,
-            WeaponsFA18EF.STA_04_02_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
+            WeaponsFA18EF.STA_04_02_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
         )
-        # ERRR {SUPERHORNET_PYLON_02_MB_MK_BR55_1X_GBU-32V}
-        # ERRR {SUPERHORNET_PYLON_02_MB_MK_BR55_2X_GBU-32V}
-        STA_04_02_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
+        STA_04_02_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
             2,
-            WeaponsFA18EF.STA_04_02_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_04_02_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
         )
-        STA_04_02_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+        STA_04_02_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
             2,
-            WeaponsFA18EF.STA_04_02_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
+            WeaponsFA18EF.STA_04_02_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
         )
-        STA_04_02_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
+        STA_04_02_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
             2,
-            WeaponsFA18EF.STA_04_02_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_04_02_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        STA_04_02_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
+        STA_04_02_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             2,
-            WeaponsFA18EF.STA_04_02_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
+            WeaponsFA18EF.STA_04_02_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
         STA_02_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X = (
             2,
             WeaponsFA18EF.STA_02_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X,
         )
         STA_02_SUU80_EMPTY = (2, WeaponsFA18EF.STA_02_SUU80_EMPTY)
-        # ERRR <CLEAN>
-        # ERRR {CATM-120C}
-        # ERRR {CATM-9M}
-        # ERRR {CATM-9X}
+        STA_02_SUU80_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_02_SUU80_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_03_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_03_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_02_03_79___80_LAU127_1x_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_02_03_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
         LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar = (
             2,
             Weapons.LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar,
@@ -4423,10 +4910,6 @@ class FA_18E(PlaneType):
         )
 
     class Pylon3:
-        STA_02_SUU79_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod = (
-            3,
-            WeaponsFA18EF.STA_02_SUU79_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod,
-        )
         STA_03_SUU79_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar_ = (
             3,
             WeaponsFA18EF.STA_03_SUU79_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar_,
@@ -4439,9 +4922,9 @@ class FA_18E(PlaneType):
             3,
             WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM_,
         )
-        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__ = (
+        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = (
             3,
-            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__,
         )
         STA_03_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM_ = (
             3,
@@ -4451,9 +4934,9 @@ class FA_18E(PlaneType):
             3,
             WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM_,
         )
-        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__ = (
+        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = (
             3,
-            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__,
         )
         STA_03_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM_ = (
             3,
@@ -4479,13 +4962,13 @@ class FA_18E(PlaneType):
             3,
             WeaponsFA18EF.STA_03_SUU79_LAU127_2x_Captive_AIM_9M_for_ACM_,
         )
-        STA_03_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = (
+        STA_03_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = (
             3,
-            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank,
+            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank,
         )
-        STA_03_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = (
+        STA_03_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = (
             3,
-            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis,
+            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis,
         )
         STA_03_SUU79_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod = (
             3,
@@ -4591,7 +5074,6 @@ class FA_18E(PlaneType):
             3,
             WeaponsFA18EF.STA_03_SUU79_BRU32_1x_GBU_38___JDAM__500lb_GPS_Guided_Bomb_,
         )
-        # ERRR {SUPERHORNET_PYLON_03_MB_MK_1X_GBU-32V}
         STA_03_SUU79_BRU32_1x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets_ = (
             3,
             WeaponsFA18EF.STA_03_SUU79_BRU32_1x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets_,
@@ -4632,7 +5114,6 @@ class FA_18E(PlaneType):
             3,
             WeaponsFA18EF.STA_03_SUU79_BRU33_2x_Mk_83___1000lb_GP_Bomb_LD_,
         )
-        # ERRR {SUPERHORNET_PYLON_03_MB_MK_BR2_ROCKEYE}
         STA_03_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb_ = (
             3,
             WeaponsFA18EF.STA_03_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb_,
@@ -4689,9 +5170,9 @@ class FA_18E(PlaneType):
             3,
             WeaponsFA18EF.STA_04_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             3,
-            WeaponsFA18EF.STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_04_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             3,
@@ -4701,19 +5182,18 @@ class FA_18E(PlaneType):
             3,
             WeaponsFA18EF.STA_04_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             3,
-            WeaponsFA18EF.STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
-        STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = (
+        STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = (
             3,
-            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank,
         )
-        STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = (
+        STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = (
             3,
-            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis,
         )
-        # ERRR {SUPERHORNET_PYLON_03_IB_PD_1X_ALQ-167}
         STA_04_SUU79_BRU32_1x_AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_ = (
             3,
             WeaponsFA18EF.STA_04_SUU79_BRU32_1x_AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_,
@@ -4818,7 +5298,6 @@ class FA_18E(PlaneType):
             3,
             WeaponsFA18EF.STA_04_SUU79_BRU33_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        # ERRR {SUPERHORNET_PYLON_03_IB_MK_BR2_ROCKEYE}
         STA_04_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             3,
             WeaponsFA18EF.STA_04_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
@@ -4827,9 +5306,9 @@ class FA_18E(PlaneType):
             3,
             WeaponsFA18EF.STA_04_SUU79_BRU55_2x_GBU_32_V_2_B___JDAM__1000lb_GPS_Guided_Bomb,
         )
-        STA_04_03_79_80_BRU32_1x_1x_AGM_154C___JSOW_Unitary_BROACH = (
+        STA_04_03_79___80_BRU32_1x_1x_AGM_154C___JSOW_Unitary_BROACH = (
             3,
-            WeaponsFA18EF.STA_04_03_79_80_BRU32_1x_1x_AGM_154C___JSOW_Unitary_BROACH,
+            WeaponsFA18EF.STA_04_03_79___80_BRU32_1x_1x_AGM_154C___JSOW_Unitary_BROACH,
         )
         STA_04_03_SUU79_BRU32_1x_1x_GBU_10___2000lb_Laser_Guided_Bomb = (
             3,
@@ -4880,10 +5359,62 @@ class FA_18E(PlaneType):
             WeaponsFA18EF.STA_04_03_SUU79_BRU32_1x_1x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
         STA_03_SUU79_EMPTY = (3, WeaponsFA18EF.STA_03_SUU79_EMPTY)
-        # ERRR <CLEAN>
-        # ERRR LAU-115_2*LAU-127_CATM-120C
-        # ERRR LAU_117_TGM_65E
-        # ERRR LAU_117_TGM_65F
+        STA_03_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__ = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__,
+        )
+        STA_03_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__ = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__,
+        )
+        STA_04_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            3,
+            WeaponsFA18EF.STA_04_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_04_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            3,
+            WeaponsFA18EF.STA_04_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__ = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__,
+        )
+        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__ = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__,
+        )
+        STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            3,
+            WeaponsFA18EF.STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            3,
+            WeaponsFA18EF.STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_03_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_ = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_,
+        )
+        STA_03_04_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_ = (
+            3,
+            WeaponsFA18EF.STA_03_04_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_,
+        )
+        STA_03_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_ = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_,
+        )
+        STA_03_04_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_ = (
+            3,
+            WeaponsFA18EF.STA_03_04_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_,
+        )
+        STA_03_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank,
+        )
+        STA_04_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = (
+            3,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank,
+        )
         LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar = (
             3,
             Weapons.LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar,
@@ -4955,9 +5486,9 @@ class FA_18E(PlaneType):
             4,
             WeaponsFA18EF.STA_05_CHEEK__LAU116_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             4,
-            WeaponsFA18EF.STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_05_CHEEK__LAU116_1x_AIM_7M_Sparrow_Semi_Active_Radar = (
             4,
@@ -4979,28 +5510,31 @@ class FA_18E(PlaneType):
             4,
             WeaponsFA18EF.STA_05_CHEEK__TGPMNT_1x_AN_ASQ_228_ATFLIR___Targeting_Pod,
         )
-        STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank_ = (
+        STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_ = (
             4,
-            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank_,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_,
         )
-        STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis_ = (
+        STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis_ = (
             4,
-            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis_,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis_,
         )
         AWW_13_DATALINK_POD = (4, Weapons.AWW_13_DATALINK_POD)
-        STA_04_SUU79_BRU32_Remove_SUU_79A_A_Pylon = (
+        STA_05_CHEEK__TGPMNT_Empty_Weapon_Replacable_Assembly__WRA__Adapter = (
             4,
-            WeaponsFA18EF.STA_04_SUU79_BRU32_Remove_SUU_79A_A_Pylon,
-        )
-        STA_05_CHEEK__TGPMNT_Empty_TGP_Mount = (
-            4,
-            WeaponsFA18EF.STA_05_CHEEK__TGPMNT_Empty_TGP_Mount,
+            WeaponsFA18EF.STA_05_CHEEK__TGPMNT_Empty_Weapon_Replacable_Assembly__WRA__Adapter,
         )
         STA_05_CHEEK__LAU116_Empty_AIM_7_120_Ejectors = (
             4,
             WeaponsFA18EF.STA_05_CHEEK__LAU116_Empty_AIM_7_120_Ejectors,
         )
-        # ERRR <CLEAN>
+        STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            4,
+            WeaponsFA18EF.STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_04_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank_ = (
+            4,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank_,
+        )
         AIM_7F_Sparrow_Semi_Active_Radar = (4, Weapons.AIM_7F_Sparrow_Semi_Active_Radar)
         AIM_7MH_Sparrow_Semi_Active_Radar = (
             4,
@@ -5013,28 +5547,35 @@ class FA_18E(PlaneType):
         )
 
     class Pylon5:
-        STA_06_SUU78_BRU32_1x_FPU_12_A_Fuel_Tank = (
+        STA_06_SUU78_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = (
             5,
-            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_12_A_Fuel_Tank,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank,
         )
-        STA_06_SUU78_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = (
+        STA_06_SUU78_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = (
             5,
-            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis,
         )
-        STA_06_SUU78_BRU32_1x_A_A_42R_1_Aerial_Refueling_Buddy_Pod = (
+        STA_06_SUU78_BRU32_1x_A_A_42R_1__300_GAL__Aerial_Refueling_Buddy_Pod__FUEL_ONLY_ = (
             5,
-            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_A_A_42R_1_Aerial_Refueling_Buddy_Pod,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_A_A_42R_1__300_GAL__Aerial_Refueling_Buddy_Pod__FUEL_ONLY_,
         )
         STA_06_SUU78_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod = (
             5,
             WeaponsFA18EF.STA_06_SUU78_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod,
         )
-        STA_06_SUU78_BRU32_1x_AN_AAQ_28_LITENING___Targeting_Pod = (
+        STA_06_SUU78_BRU32_1x_AN_AAQ_28_LITENING_Targeting_Pod = (
             5,
-            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_AN_AAQ_28_LITENING___Targeting_Pod,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_AN_AAQ_28_LITENING_Targeting_Pod,
+        )
+        STA_06_SUU78_BRU32_1x_FPU_13_A__340_GAL__with_ASG_34A_V_1_Infrared_Search_and_Track_System___FUEL_ONLY__ = (
+            5,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_13_A__340_GAL__with_ASG_34A_V_1_Infrared_Search_and_Track_System___FUEL_ONLY__,
         )
         STA_06_SUU78_EMPTY = (5, WeaponsFA18EF.STA_06_SUU78_EMPTY)
-        # ERRR <CLEAN>
+        STA_06_SUU78_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = (
+            5,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank,
+        )
         AWW_13_DATALINK_POD = (5, Weapons.AWW_13_DATALINK_POD)
         AN_AAQ_28_LITENING___Targeting_Pod_ = (
             5,
@@ -5050,9 +5591,9 @@ class FA_18E(PlaneType):
             6,
             WeaponsFA18EF.STA_07_CHEEK__LAU116_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             6,
-            WeaponsFA18EF.STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_07_CHEEK__LAU116_1x_AIM_7M_Sparrow_Semi_Active_Radar = (
             6,
@@ -5070,28 +5611,27 @@ class FA_18E(PlaneType):
             6,
             WeaponsFA18EF.STA_07_CHEEK__LAU116_1x_AIM_7P_Sparrow_Semi_Active_Radar,
         )
-        STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = (
+        STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = (
             6,
-            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank,
         )
-        STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = (
+        STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = (
             6,
-            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis,
         )
         STA_08_SUU79_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod = (
             6,
             WeaponsFA18EF.STA_08_SUU79_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod,
         )
-        STA_07_SUU79_BRU32_Remove_SUU_79A_A_Pylon = (
-            6,
-            WeaponsFA18EF.STA_07_SUU79_BRU32_Remove_SUU_79A_A_Pylon,
-        )
         STA_08_SUU79_EMPTY = (6, WeaponsFA18EF.STA_08_SUU79_EMPTY)
-        STA_08_SUU79_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X = (
+        STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
             6,
-            WeaponsFA18EF.STA_08_SUU79_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X,
+            WeaponsFA18EF.STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_08_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = (
+            6,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank,
         )
-        # ERRR <CLEAN>
         AIM_7F_Sparrow_Semi_Active_Radar = (6, Weapons.AIM_7F_Sparrow_Semi_Active_Radar)
         AIM_7MH_Sparrow_Semi_Active_Radar = (
             6,
@@ -5101,10 +5641,6 @@ class FA_18E(PlaneType):
         AWW_13_DATALINK_POD = (6, Weapons.AWW_13_DATALINK_POD)
 
     class Pylon7:
-        STA_09_SUU79_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod = (
-            7,
-            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod,
-        )
         STA_09_SUU79_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar = (
             7,
             WeaponsFA18EF.STA_09_SUU79_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar,
@@ -5117,9 +5653,9 @@ class FA_18E(PlaneType):
             7,
             WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             7,
-            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_09_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             7,
@@ -5129,9 +5665,9 @@ class FA_18E(PlaneType):
             7,
             WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             7,
-            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_09_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM = (
             7,
@@ -5157,13 +5693,13 @@ class FA_18E(PlaneType):
             7,
             WeaponsFA18EF.STA_09_SUU79_LAU127_2x_Captive_AIM_9M_for_ACM,
         )
-        STA_09_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = (
+        STA_09_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = (
             7,
-            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank,
+            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank,
         )
-        STA_09_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = (
+        STA_09_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = (
             7,
-            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis,
+            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis,
         )
         STA_09_SUU79_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod = (
             7,
@@ -5313,7 +5849,6 @@ class FA_18E(PlaneType):
             7,
             WeaponsFA18EF.STA_09_SUU79_BRU33_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        # ERRR {SUPERHORNET_PYLON_09_MB_MK_BR2_ROCKEYE}
         STA_09_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             7,
             WeaponsFA18EF.STA_09_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
@@ -5370,9 +5905,9 @@ class FA_18E(PlaneType):
             7,
             WeaponsFA18EF.STA_08_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             7,
-            WeaponsFA18EF.STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_08_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             7,
@@ -5382,20 +5917,18 @@ class FA_18E(PlaneType):
             7,
             WeaponsFA18EF.STA_08_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             7,
-            WeaponsFA18EF.STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
-        STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank_ = (
+        STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_ = (
             7,
-            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank_,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_,
         )
-        STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis_ = (
+        STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis_ = (
             7,
-            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis_,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis_,
         )
-        # ERRR {SUPERHORNET_PYLON_09_IB_PD_1X_ALQ-167}
-        # ERRR {SUPERHORNET_PYLON_09_IB_PD_1X_ALQ-167}
         STA_08_SUU79_BRU32_1x_AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_ = (
             7,
             WeaponsFA18EF.STA_08_SUU79_BRU32_1x_AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_,
@@ -5500,7 +6033,6 @@ class FA_18E(PlaneType):
             7,
             WeaponsFA18EF.STA_08_SUU79_BRU33_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        # ERRR {SUPERHORNET_PYLON_09_IB_MK_BR2_ROCKEYE}
         STA_08_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             7,
             WeaponsFA18EF.STA_08_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
@@ -5562,10 +6094,62 @@ class FA_18E(PlaneType):
             WeaponsFA18EF.STA_09_08_SUU79_BRU32_1x_1x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
         STA_09_SUU79_EMPTY = (7, WeaponsFA18EF.STA_09_SUU79_EMPTY)
-        # ERRR <CLEAN>
-        # ERRR LAU-115_2*LAU-127_CATM-120C
-        # ERRR LAU_117_TGM_65E
-        # ERRR LAU_117_TGM_65F
+        STA_09_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_09_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_08_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_08_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_08_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_08_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_09_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_,
+        )
+        STA_09_08_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_09_08_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_,
+        )
+        STA_09_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_ = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_,
+        )
+        STA_09_08_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_ = (
+            7,
+            WeaponsFA18EF.STA_09_08_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_,
+        )
+        STA_09_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank,
+        )
+        STA_08_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank_ = (
+            7,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank_,
+        )
         LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar = (
             7,
             Weapons.LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar,
@@ -5653,9 +6237,9 @@ class FA_18E(PlaneType):
             8,
             WeaponsFA18EF.STA_10_SUU80_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             8,
-            WeaponsFA18EF.STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_10_SUU80_LAU117_1x_AGM_65E___Maverick_E__Laser_ASM___Lg_Whd_ = (
             8,
@@ -5749,9 +6333,9 @@ class FA_18E(PlaneType):
             8,
             WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM_,
         )
-        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__ = (
+        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = (
             8,
-            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__,
         )
         STA_09_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM_ = (
             8,
@@ -5761,9 +6345,9 @@ class FA_18E(PlaneType):
             8,
             WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM_,
         )
-        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__ = (
+        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = (
             8,
-            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__,
         )
         STA_09_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM_ = (
             8,
@@ -5897,87 +6481,115 @@ class FA_18E(PlaneType):
             8,
             WeaponsFA18EF.STA_09_SUU79_BRU33_2x_GBU_12___500lb_Laser_Guided_Bomb_,
         )
-        STA_09_10_79_80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM = (
+        STA_09_10_79___80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM,
         )
-        STA_09_10_79_80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM = (
+        STA_09_10_79___80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM,
         )
-        STA_09_10_79_80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
+        STA_09_10_79___80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
         )
-        STA_09_10_79_80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
+        STA_09_10_79___80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_09_10_79_80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_09_10_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
-        STA_09_10_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
+        STA_09_10_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
         )
-        STA_09_10_79_80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb = (
+        STA_09_10_79___80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb,
         )
-        STA_09_10_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
+        STA_09_10_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
         )
-        STA_09_10_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
+        STA_09_10_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
         )
-        STA_09_10_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+        STA_09_10_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
         )
-        STA_09_10_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
+        STA_09_10_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        STA_09_10_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
+        STA_09_10_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
-        STA_10_08_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
+        STA_10_08_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
             8,
-            WeaponsFA18EF.STA_10_08_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
+            WeaponsFA18EF.STA_10_08_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
         )
-        STA_10_08_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
+        STA_10_08_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             8,
-            WeaponsFA18EF.STA_10_08_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
+            WeaponsFA18EF.STA_10_08_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
         )
-        STA_10_08_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
+        STA_10_08_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
             8,
-            WeaponsFA18EF.STA_10_08_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_10_08_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
         )
-        STA_10_08_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+        STA_10_08_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
             8,
-            WeaponsFA18EF.STA_10_08_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
+            WeaponsFA18EF.STA_10_08_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
         )
-        STA_10_08_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
+        STA_10_08_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
             8,
-            WeaponsFA18EF.STA_10_08_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_10_08_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        STA_10_08_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
+        STA_10_08_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             8,
-            WeaponsFA18EF.STA_10_08_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
+            WeaponsFA18EF.STA_10_08_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
         STA_10_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X = (
             8,
             WeaponsFA18EF.STA_10_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X,
         )
         STA_10_SUU80_EMPTY = (8, WeaponsFA18EF.STA_10_SUU80_EMPTY)
-        # ERRR <CLEAN>
-        # ERRR {CATM-120C}
-        # ERRR {CATM-9M}
-        # ERRR {CATM-9X}
+        STA_10_SUU80_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            8,
+            WeaponsFA18EF.STA_10_SUU80_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_09_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__ = (
+            8,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__,
+        )
+        STA_09_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__ = (
+            8,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__,
+        )
+        STA_09_10_79___80_LAU127_1x_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            8,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            8,
+            WeaponsFA18EF.STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__ = (
+            8,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__,
+        )
+        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__ = (
+            8,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__,
+        )
+        STA_09_10_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            8,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
         LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar = (
             8,
             Weapons.LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar,
@@ -6034,11 +6646,15 @@ class FA_18E(PlaneType):
             9,
             WeaponsFA18EF.STA_11_WNGTP_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod,
         )
+        STA_11_WNGTP_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            9,
+            WeaponsFA18EF.STA_11_WNGTP_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
 
     class Pylon10:
-        STA_AX_FUEL_CELLS_1x_Internal_Auxillary_Fuel_Cells = (
+        STA_AX_FUEL_CELLS_1x_Internal_Auxillary_Fuel_Cells__570_GAL_ = (
             10,
-            WeaponsFA18EF.STA_AX_FUEL_CELLS_1x_Internal_Auxillary_Fuel_Cells,
+            WeaponsFA18EF.STA_AX_FUEL_CELLS_1x_Internal_Auxillary_Fuel_Cells__570_GAL_,
         )
         STA_AX_CKPIT_SMOKE_1x_Internal_Smoke_Generator___White = (
             10,
@@ -6179,14 +6795,20 @@ class FA_18F(PlaneType):
         "BlockIIIEquip": True,
         "HelmetMountedDevice": 1,
         "HelmetMountedDeviceWSO": 1,
-        "RemoveLOutboard": False,
-        "RemoveLMidboard": False,
-        "RemoveLInboard": False,
-        "RemoveRInboard": False,
-        "RemoveRMidboard": False,
-        "RemoveROutboard": False,
+        "RemoveLOutboard": True,
+        "RemoveLMidboard": True,
+        "RemoveLInboard": True,
+        "RemoveLCheek": True,
+        "RemoveCenter": True,
+        "RemoveRCheek": True,
+        "RemoveRInboard": True,
+        "RemoveRMidboard": True,
+        "RemoveROutboard": True,
         "OuterBoard": 0,
         "InnerBoard": 0,
+        "VoiceCallsignLabel": None,
+        "VoiceCallsignNumber": None,
+        "STN_L16": None,
         "DYNAMIC_BORTS_MODE": 0,
         "DYNAMIC_BUNOS": False,
         "DYNAMIC_BUNO_01": 10,
@@ -6248,6 +6870,15 @@ class FA_18F(PlaneType):
         class RemoveLInboard:
             id = "RemoveLInboard"
 
+        class RemoveLCheek:
+            id = "RemoveLCheek"
+
+        class RemoveCenter:
+            id = "RemoveCenter"
+
+        class RemoveRCheek:
+            id = "RemoveRCheek"
+
         class RemoveRInboard:
             id = "RemoveRInboard"
 
@@ -6271,6 +6902,15 @@ class FA_18F(PlaneType):
                 Single = 0
                 Ripple = 1
 
+        class VoiceCallsignLabel:
+            id = "VoiceCallsignLabel"
+
+        class VoiceCallsignNumber:
+            id = "VoiceCallsignNumber"
+
+        class STN_L16:
+            id = "STN_L16"
+
         class DYNAMIC_BORTS_MODE:
             id = "DYNAMIC_BORTS_MODE"
 
@@ -6382,58 +7022,68 @@ class FA_18F(PlaneType):
                 Blank = 10
 
     properties = {
+        "WSO_Label": UnitPropertyDescription(
+            identifier="WSO_Label",
+            control="label",
+            label="Aircraft Crew Settings",
+            player_only=False,
+            x_lbl=150,
+        ),
         "SoloFlight": UnitPropertyDescription(
             identifier="SoloFlight",
-            control="comboList",
-            label="Solo Flight (Remove WSO)",
+            control="checkbox",
+            label="Solo Flight",
             player_only=False,
+            default=False,
+            weight_when_on=-80,
+        ),
+        "EQUIPMENT_Label": UnitPropertyDescription(
+            identifier="EQUIPMENT_Label",
+            control="label",
+            label="Aircraft / Pilot Equipment Settings",
+            player_only=False,
+            x_lbl=100,
+        ),
+        "AIRCRAFT_ID_SEQ": UnitPropertyDescription(
+            identifier="AIRCRAFT_ID_SEQ",
+            control="comboList",
+            label="Aircraft Strobe Sequence",
+            player_only=True,
             default=0,
             w_ctrl=150,
             values={
-                0: "False",
-                1: "True",
+                0: "Norm",
+                1: "Pattern 0A",
+                2: "Pattern 1B",
+                3: "Pattern 2C",
+                4: "Pattern 3D",
+                5: "Pattern 4E",
+                6: "Pattern 5F",
             },
         ),
         "DemoEquipment": UnitPropertyDescription(
             identifier="DemoEquipment",
-            control="comboList",
-            label="Demonstration Team Equipment",
-            player_only=False,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            control="checkbox",
+            label="USN Demo Team Equipment",
+            default=False,
+            weight_when_on=-140.2,
         ),
         "USA_FLAG": UnitPropertyDescription(
             identifier="USA_FLAG",
-            control="comboList",
+            control="checkbox",
             label="Hood Displayed USA Flag",
-            player_only=False,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            default=False,
         ),
         "BlockIIIEquip": UnitPropertyDescription(
             identifier="BlockIIIEquip",
-            control="comboList",
+            control="checkbox",
             label="Block III Antennas (Cosmetic)",
-            player_only=False,
-            default=1,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            default=True,
         ),
         "HelmetMountedDevice": UnitPropertyDescription(
             identifier="HelmetMountedDevice",
             control="comboList",
-            label="Helmet Mounted Device",
+            label="Pilot Helmet Mounted Device",
             player_only=True,
             default=1,
             w_ctrl=150,
@@ -6456,77 +7106,89 @@ class FA_18F(PlaneType):
                 2: "NVG",
             },
         ),
+        "EQUIPMENT_Label": UnitPropertyDescription(
+            identifier="EQUIPMENT_Label",
+            control="label",
+            label="Additional Pylon Control",
+            player_only=False,
+            x_lbl=100,
+        ),
+        "EQUIPMENT_Label_USER": UnitPropertyDescription(
+            identifier="EQUIPMENT_Label_USER",
+            control="label",
+            label="*(User req. to remove stores)",
+            player_only=False,
+            x_lbl=100,
+        ),
         "RemoveLOutboard": UnitPropertyDescription(
             identifier="RemoveLOutboard",
-            control="comboList",
-            label="Dismount STA 2 SUU-80A Pylon (Left Outboard)",
-            player_only=False,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            control="checkbox",
+            label="Mount STA 2 SUU-80A Pylon",
+            default=True,
+            weight_when_on=55.79,
         ),
         "RemoveLMidboard": UnitPropertyDescription(
             identifier="RemoveLMidboard",
-            control="comboList",
-            label="Dismount STA 3 SUU-79A Pylon (Left Midboard)",
-            player_only=False,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            control="checkbox",
+            label="Mount STA 3 SUU-79A Pylon",
+            default=True,
+            weight_when_on=163.29,
         ),
         "RemoveLInboard": UnitPropertyDescription(
-            identifier="RemoveLMidboard",
-            control="comboList",
-            label="Dismount STA 4 SUU-79A Pylon (Left Inboard)",
-            player_only=False,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            identifier="RemoveLInboard",
+            control="checkbox",
+            label="Mount STA 4 SUU-79A Pylon",
+            default=True,
+            weight_when_on=163.29,
+        ),
+        "RemoveLCheek": UnitPropertyDescription(
+            identifier="RemoveLCheek",
+            control="checkbox",
+            label="Mount STA 5 LAU-115 Pylon",
+            default=True,
+            weight_when_on=30.84,
+        ),
+        "RemoveCenter": UnitPropertyDescription(
+            identifier="RemoveCenter",
+            control="checkbox",
+            label="Mount STA 6 SUU-78A Pylon",
+            default=True,
+            weight_when_on=83,
+        ),
+        "RemoveRCheek": UnitPropertyDescription(
+            identifier="RemoveRCheek",
+            control="checkbox",
+            label="Mount STA 7 LAU-115 Pylon",
+            default=True,
+            weight_when_on=30.84,
         ),
         "RemoveRInboard": UnitPropertyDescription(
             identifier="RemoveRInboard",
-            control="comboList",
-            label="Dismount STA 8 SUU-79A Pylon (Right Inboard)",
-            player_only=False,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            control="checkbox",
+            label="Mount STA 8 SUU-79A Pylon",
+            default=True,
+            weight_when_on=163.29,
         ),
         "RemoveRMidboard": UnitPropertyDescription(
-            identifier="RemoveRInboard",
-            control="comboList",
-            label="Dismount STA 9 SUU-79A Pylon (Right Midboard)",
-            player_only=False,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            identifier="RemoveRMidboard",
+            control="checkbox",
+            label="Mount STA 9 SUU-79A Pylon",
+            default=True,
+            weight_when_on=163.29,
         ),
         "RemoveROutboard": UnitPropertyDescription(
             identifier="RemoveROutboard",
-            control="comboList",
-            label="Dismount STA 10 SUU-80A Pylon (Right Outboard)",
-            player_only=False,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            control="checkbox",
+            label="Mount STA 10 SUU-80A Pylon",
+            default=True,
+            weight_when_on=55.79,
+        ),
+        "ROCKETS_Label": UnitPropertyDescription(
+            identifier="ROCKETS_Label",
+            control="label",
+            label="Aircraft Rocket Settings",
+            player_only=True,
+            x_lbl=100,
         ),
         "OuterBoard": UnitPropertyDescription(
             identifier="OuterBoard",
@@ -6555,9 +7217,9 @@ class FA_18F(PlaneType):
         "datalink_Label": UnitPropertyDescription(
             identifier="datalink_Label",
             control="label",
-            label="DATALINK",
+            label="Datalink Settings",
             player_only=False,
-            x_lbl=150,
+            x_lbl=100,
         ),
         "VoiceCallsignLabel": UnitPropertyDescription(
             identifier="VoiceCallsignLabel",
@@ -6577,6 +7239,161 @@ class FA_18F(PlaneType):
             label="STN",
             player_only=False,
         ),
+        "DYNAMIC_BORTS": UnitPropertyDescription(
+            identifier="DYNAMIC_BORTS",
+            control="label",
+            label="Aircraft Identification Stencils",
+            player_only=False,
+            x_lbl=100,
+        ),
+        "DYNAMIC_BORTS_MODE": UnitPropertyDescription(
+            identifier="DYNAMIC_BORTS_MODE",
+            control="comboList",
+            label="Aircraft Identification Type",
+            player_only=False,
+            default=0,
+            w_ctrl=150,
+            values={
+                0: "DISABLED / NONE",
+                1: "USN STANDARD",
+                2: "RAAF FIGHTER",
+                3: "RAAF GROWLER",
+                4: "KAF LEGACY",
+                5: "KAF SUPER HORNET",
+            },
+        ),
+        "DYNAMIC_BUNOS": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNOS",
+            control="checkbox",
+            label="Aircraft Identification BUNO",
+            default=False,
+        ),
+        "DYNAMIC_BUNO_01": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_01",
+            control="comboList",
+            label="Aircraft BUNO Digit #1",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_02": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_02",
+            control="comboList",
+            label="Aircraft BUNO Digit #2",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_03": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_03",
+            control="comboList",
+            label="Aircraft BUNO Digit #3",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_04": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_04",
+            control="comboList",
+            label="Aircraft BUNO Digit #4",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_05": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_05",
+            control="comboList",
+            label="Aircraft BUNO Digit #5",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_06": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_06",
+            control="comboList",
+            label="Aircraft BUNO Digit #6",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
     }
 
     livery_name = "FA-18F"  # from livery_entry
@@ -6598,6 +7415,10 @@ class FA_18F(PlaneType):
             1,
             WeaponsFA18EF.STA_01_WNGTP_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod,
         )
+        STA_01_WNGTP_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            1,
+            WeaponsFA18EF.STA_01_WNGTP_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
 
     class Pylon2:
         STA_02_SUU80_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar = (
@@ -6628,9 +7449,9 @@ class FA_18F(PlaneType):
             2,
             WeaponsFA18EF.STA_02_SUU80_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             2,
-            WeaponsFA18EF.STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_02_SUU80_LAU117_1x_AGM_65E___Maverick_E__Laser_ASM___Lg_Whd_ = (
             2,
@@ -6724,9 +7545,9 @@ class FA_18F(PlaneType):
             2,
             WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             2,
-            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_03_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             2,
@@ -6736,9 +7557,9 @@ class FA_18F(PlaneType):
             2,
             WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             2,
-            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_03_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM = (
             2,
@@ -6848,7 +7669,6 @@ class FA_18F(PlaneType):
             2,
             WeaponsFA18EF.STA_03_SUU79_BRU32_1x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
-        # ERRR {SUPERHORNET_PYLON_02_MB_MK_BR55_1X_GBU-38}
         STA_03_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             2,
             WeaponsFA18EF.STA_03_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
@@ -6873,89 +7693,115 @@ class FA_18F(PlaneType):
             2,
             WeaponsFA18EF.STA_03_SUU79_BRU33_2x_GBU_12___500lb_Laser_Guided_Bomb,
         )
-        STA_02_03_79_80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM = (
+        STA_02_03_79___80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM = (
             2,
-            WeaponsFA18EF.STA_02_03_79_80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM,
         )
-        STA_02_03_79_80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM = (
+        STA_02_03_79___80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM = (
             2,
-            WeaponsFA18EF.STA_02_03_79_80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM,
         )
-        STA_02_03_79_80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
+        STA_02_03_79___80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             2,
-            WeaponsFA18EF.STA_02_03_79_80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
         )
-        STA_02_03_79_80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
+        STA_02_03_79___80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
             2,
-            WeaponsFA18EF.STA_02_03_79_80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_02_03_79_80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_02_03_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             2,
-            WeaponsFA18EF.STA_02_03_79_80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
-        STA_03_02_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
+        STA_03_02_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
         )
-        STA_03_02_79_80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb = (
+        STA_03_02_79___80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb,
         )
-        STA_03_02_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
+        STA_03_02_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
         )
-        STA_03_02_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
+        STA_03_02_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
         )
-        STA_03_02_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+        STA_03_02_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
         )
-        STA_03_02_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
+        STA_03_02_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        STA_03_02_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
+        STA_03_02_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
-        STA_04_02_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
+        STA_04_02_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
             2,
-            WeaponsFA18EF.STA_04_02_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
+            WeaponsFA18EF.STA_04_02_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
         )
-        STA_04_02_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
+        STA_04_02_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             2,
-            WeaponsFA18EF.STA_04_02_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
+            WeaponsFA18EF.STA_04_02_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
         )
-        # ERRR {SUPERHORNET_PYLON_02_MB_MK_BR55_1X_GBU-32V}
-        # ERRR {SUPERHORNET_PYLON_02_MB_MK_BR55_2X_GBU-32V}
-        STA_04_02_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
+        STA_04_02_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
             2,
-            WeaponsFA18EF.STA_04_02_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_04_02_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
         )
-        STA_04_02_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+        STA_04_02_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
             2,
-            WeaponsFA18EF.STA_04_02_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
+            WeaponsFA18EF.STA_04_02_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
         )
-        STA_04_02_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
+        STA_04_02_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
             2,
-            WeaponsFA18EF.STA_04_02_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_04_02_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        STA_04_02_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
+        STA_04_02_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             2,
-            WeaponsFA18EF.STA_04_02_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
+            WeaponsFA18EF.STA_04_02_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
         STA_02_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X = (
             2,
             WeaponsFA18EF.STA_02_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X,
         )
         STA_02_SUU80_EMPTY = (2, WeaponsFA18EF.STA_02_SUU80_EMPTY)
-        # ERRR <CLEAN>
-        # ERRR {CATM-120C}
-        # ERRR {CATM-9M}
-        # ERRR {CATM-9X}
+        STA_02_SUU80_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_02_SUU80_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_03_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_03_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_02_03_79___80_LAU127_1x_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_02_03_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
         LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar = (
             2,
             Weapons.LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar,
@@ -6996,10 +7842,6 @@ class FA_18F(PlaneType):
         )
 
     class Pylon3:
-        STA_02_SUU79_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod = (
-            3,
-            WeaponsFA18EF.STA_02_SUU79_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod,
-        )
         STA_03_SUU79_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar_ = (
             3,
             WeaponsFA18EF.STA_03_SUU79_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar_,
@@ -7012,9 +7854,9 @@ class FA_18F(PlaneType):
             3,
             WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM_,
         )
-        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__ = (
+        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = (
             3,
-            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__,
         )
         STA_03_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM_ = (
             3,
@@ -7024,9 +7866,9 @@ class FA_18F(PlaneType):
             3,
             WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM_,
         )
-        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__ = (
+        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = (
             3,
-            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__,
         )
         STA_03_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM_ = (
             3,
@@ -7052,13 +7894,13 @@ class FA_18F(PlaneType):
             3,
             WeaponsFA18EF.STA_03_SUU79_LAU127_2x_Captive_AIM_9M_for_ACM_,
         )
-        STA_03_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = (
+        STA_03_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = (
             3,
-            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank,
+            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank,
         )
-        STA_03_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = (
+        STA_03_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = (
             3,
-            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis,
+            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis,
         )
         STA_03_SUU79_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod = (
             3,
@@ -7164,7 +8006,6 @@ class FA_18F(PlaneType):
             3,
             WeaponsFA18EF.STA_03_SUU79_BRU32_1x_GBU_38___JDAM__500lb_GPS_Guided_Bomb_,
         )
-        # ERRR {SUPERHORNET_PYLON_03_MB_MK_1X_GBU-32V}
         STA_03_SUU79_BRU32_1x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets_ = (
             3,
             WeaponsFA18EF.STA_03_SUU79_BRU32_1x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets_,
@@ -7205,7 +8046,6 @@ class FA_18F(PlaneType):
             3,
             WeaponsFA18EF.STA_03_SUU79_BRU33_2x_Mk_83___1000lb_GP_Bomb_LD_,
         )
-        # ERRR {SUPERHORNET_PYLON_03_MB_MK_BR2_ROCKEYE}
         STA_03_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb_ = (
             3,
             WeaponsFA18EF.STA_03_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb_,
@@ -7262,9 +8102,9 @@ class FA_18F(PlaneType):
             3,
             WeaponsFA18EF.STA_04_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             3,
-            WeaponsFA18EF.STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_04_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             3,
@@ -7274,19 +8114,18 @@ class FA_18F(PlaneType):
             3,
             WeaponsFA18EF.STA_04_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             3,
-            WeaponsFA18EF.STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
-        STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = (
+        STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = (
             3,
-            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank,
         )
-        STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = (
+        STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = (
             3,
-            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis,
         )
-        # ERRR {SUPERHORNET_PYLON_03_IB_PD_1X_ALQ-167}
         STA_04_SUU79_BRU32_1x_AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_ = (
             3,
             WeaponsFA18EF.STA_04_SUU79_BRU32_1x_AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_,
@@ -7391,7 +8230,6 @@ class FA_18F(PlaneType):
             3,
             WeaponsFA18EF.STA_04_SUU79_BRU33_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        # ERRR {SUPERHORNET_PYLON_03_IB_MK_BR2_ROCKEYE}
         STA_04_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             3,
             WeaponsFA18EF.STA_04_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
@@ -7400,9 +8238,9 @@ class FA_18F(PlaneType):
             3,
             WeaponsFA18EF.STA_04_SUU79_BRU55_2x_GBU_32_V_2_B___JDAM__1000lb_GPS_Guided_Bomb,
         )
-        STA_04_03_79_80_BRU32_1x_1x_AGM_154C___JSOW_Unitary_BROACH = (
+        STA_04_03_79___80_BRU32_1x_1x_AGM_154C___JSOW_Unitary_BROACH = (
             3,
-            WeaponsFA18EF.STA_04_03_79_80_BRU32_1x_1x_AGM_154C___JSOW_Unitary_BROACH,
+            WeaponsFA18EF.STA_04_03_79___80_BRU32_1x_1x_AGM_154C___JSOW_Unitary_BROACH,
         )
         STA_04_03_SUU79_BRU32_1x_1x_GBU_10___2000lb_Laser_Guided_Bomb = (
             3,
@@ -7453,10 +8291,62 @@ class FA_18F(PlaneType):
             WeaponsFA18EF.STA_04_03_SUU79_BRU32_1x_1x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
         STA_03_SUU79_EMPTY = (3, WeaponsFA18EF.STA_03_SUU79_EMPTY)
-        # ERRR <CLEAN>
-        # ERRR LAU-115_2*LAU-127_CATM-120C
-        # ERRR LAU_117_TGM_65E
-        # ERRR LAU_117_TGM_65F
+        STA_03_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__ = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__,
+        )
+        STA_03_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__ = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__,
+        )
+        STA_04_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            3,
+            WeaponsFA18EF.STA_04_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_04_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            3,
+            WeaponsFA18EF.STA_04_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__ = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__,
+        )
+        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__ = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__,
+        )
+        STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            3,
+            WeaponsFA18EF.STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            3,
+            WeaponsFA18EF.STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_03_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_ = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_,
+        )
+        STA_03_04_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_ = (
+            3,
+            WeaponsFA18EF.STA_03_04_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_,
+        )
+        STA_03_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_ = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_,
+        )
+        STA_03_04_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_ = (
+            3,
+            WeaponsFA18EF.STA_03_04_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_,
+        )
+        STA_03_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank,
+        )
+        STA_04_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = (
+            3,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank,
+        )
         LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar = (
             3,
             Weapons.LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar,
@@ -7528,9 +8418,9 @@ class FA_18F(PlaneType):
             4,
             WeaponsFA18EF.STA_05_CHEEK__LAU116_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             4,
-            WeaponsFA18EF.STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_05_CHEEK__LAU116_1x_AIM_7M_Sparrow_Semi_Active_Radar = (
             4,
@@ -7552,28 +8442,31 @@ class FA_18F(PlaneType):
             4,
             WeaponsFA18EF.STA_05_CHEEK__TGPMNT_1x_AN_ASQ_228_ATFLIR___Targeting_Pod,
         )
-        STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank_ = (
+        STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_ = (
             4,
-            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank_,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_,
         )
-        STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis_ = (
+        STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis_ = (
             4,
-            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis_,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis_,
         )
         AWW_13_DATALINK_POD = (4, Weapons.AWW_13_DATALINK_POD)
-        STA_04_SUU79_BRU32_Remove_SUU_79A_A_Pylon = (
+        STA_05_CHEEK__TGPMNT_Empty_Weapon_Replacable_Assembly__WRA__Adapter = (
             4,
-            WeaponsFA18EF.STA_04_SUU79_BRU32_Remove_SUU_79A_A_Pylon,
-        )
-        STA_05_CHEEK__TGPMNT_Empty_TGP_Mount = (
-            4,
-            WeaponsFA18EF.STA_05_CHEEK__TGPMNT_Empty_TGP_Mount,
+            WeaponsFA18EF.STA_05_CHEEK__TGPMNT_Empty_Weapon_Replacable_Assembly__WRA__Adapter,
         )
         STA_05_CHEEK__LAU116_Empty_AIM_7_120_Ejectors = (
             4,
             WeaponsFA18EF.STA_05_CHEEK__LAU116_Empty_AIM_7_120_Ejectors,
         )
-        # ERRR <CLEAN>
+        STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            4,
+            WeaponsFA18EF.STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_04_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank_ = (
+            4,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank_,
+        )
         AIM_7F_Sparrow_Semi_Active_Radar = (4, Weapons.AIM_7F_Sparrow_Semi_Active_Radar)
         AIM_7MH_Sparrow_Semi_Active_Radar = (
             4,
@@ -7586,28 +8479,35 @@ class FA_18F(PlaneType):
         )
 
     class Pylon5:
-        STA_06_SUU78_BRU32_1x_FPU_12_A_Fuel_Tank = (
+        STA_06_SUU78_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = (
             5,
-            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_12_A_Fuel_Tank,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank,
         )
-        STA_06_SUU78_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = (
+        STA_06_SUU78_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = (
             5,
-            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis,
         )
-        STA_06_SUU78_BRU32_1x_A_A_42R_1_Aerial_Refueling_Buddy_Pod = (
+        STA_06_SUU78_BRU32_1x_A_A_42R_1__300_GAL__Aerial_Refueling_Buddy_Pod__FUEL_ONLY_ = (
             5,
-            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_A_A_42R_1_Aerial_Refueling_Buddy_Pod,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_A_A_42R_1__300_GAL__Aerial_Refueling_Buddy_Pod__FUEL_ONLY_,
         )
         STA_06_SUU78_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod = (
             5,
             WeaponsFA18EF.STA_06_SUU78_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod,
         )
-        STA_06_SUU78_BRU32_1x_AN_AAQ_28_LITENING___Targeting_Pod = (
+        STA_06_SUU78_BRU32_1x_AN_AAQ_28_LITENING_Targeting_Pod = (
             5,
-            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_AN_AAQ_28_LITENING___Targeting_Pod,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_AN_AAQ_28_LITENING_Targeting_Pod,
+        )
+        STA_06_SUU78_BRU32_1x_FPU_13_A__340_GAL__with_ASG_34A_V_1_Infrared_Search_and_Track_System___FUEL_ONLY__ = (
+            5,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_13_A__340_GAL__with_ASG_34A_V_1_Infrared_Search_and_Track_System___FUEL_ONLY__,
         )
         STA_06_SUU78_EMPTY = (5, WeaponsFA18EF.STA_06_SUU78_EMPTY)
-        # ERRR <CLEAN>
+        STA_06_SUU78_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = (
+            5,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank,
+        )
         AWW_13_DATALINK_POD = (5, Weapons.AWW_13_DATALINK_POD)
         AN_AAQ_28_LITENING___Targeting_Pod_ = (
             5,
@@ -7623,9 +8523,9 @@ class FA_18F(PlaneType):
             6,
             WeaponsFA18EF.STA_07_CHEEK__LAU116_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             6,
-            WeaponsFA18EF.STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_07_CHEEK__LAU116_1x_AIM_7M_Sparrow_Semi_Active_Radar = (
             6,
@@ -7643,28 +8543,27 @@ class FA_18F(PlaneType):
             6,
             WeaponsFA18EF.STA_07_CHEEK__LAU116_1x_AIM_7P_Sparrow_Semi_Active_Radar,
         )
-        STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = (
+        STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = (
             6,
-            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank,
         )
-        STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = (
+        STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = (
             6,
-            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis,
         )
         STA_08_SUU79_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod = (
             6,
             WeaponsFA18EF.STA_08_SUU79_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod,
         )
-        STA_07_SUU79_BRU32_Remove_SUU_79A_A_Pylon = (
-            6,
-            WeaponsFA18EF.STA_07_SUU79_BRU32_Remove_SUU_79A_A_Pylon,
-        )
         STA_08_SUU79_EMPTY = (6, WeaponsFA18EF.STA_08_SUU79_EMPTY)
-        STA_08_SUU79_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X = (
+        STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
             6,
-            WeaponsFA18EF.STA_08_SUU79_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X,
+            WeaponsFA18EF.STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_08_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = (
+            6,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank,
         )
-        # ERRR <CLEAN>
         AIM_7F_Sparrow_Semi_Active_Radar = (6, Weapons.AIM_7F_Sparrow_Semi_Active_Radar)
         AIM_7MH_Sparrow_Semi_Active_Radar = (
             6,
@@ -7674,10 +8573,6 @@ class FA_18F(PlaneType):
         AWW_13_DATALINK_POD = (6, Weapons.AWW_13_DATALINK_POD)
 
     class Pylon7:
-        STA_09_SUU79_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod = (
-            7,
-            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod,
-        )
         STA_09_SUU79_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar = (
             7,
             WeaponsFA18EF.STA_09_SUU79_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar,
@@ -7690,9 +8585,9 @@ class FA_18F(PlaneType):
             7,
             WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             7,
-            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_09_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             7,
@@ -7702,9 +8597,9 @@ class FA_18F(PlaneType):
             7,
             WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             7,
-            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_09_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM = (
             7,
@@ -7730,13 +8625,13 @@ class FA_18F(PlaneType):
             7,
             WeaponsFA18EF.STA_09_SUU79_LAU127_2x_Captive_AIM_9M_for_ACM,
         )
-        STA_09_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = (
+        STA_09_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = (
             7,
-            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank,
+            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank,
         )
-        STA_09_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = (
+        STA_09_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = (
             7,
-            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis,
+            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis,
         )
         STA_09_SUU79_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod = (
             7,
@@ -7886,7 +8781,6 @@ class FA_18F(PlaneType):
             7,
             WeaponsFA18EF.STA_09_SUU79_BRU33_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        # ERRR {SUPERHORNET_PYLON_09_MB_MK_BR2_ROCKEYE}
         STA_09_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             7,
             WeaponsFA18EF.STA_09_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
@@ -7943,9 +8837,9 @@ class FA_18F(PlaneType):
             7,
             WeaponsFA18EF.STA_08_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             7,
-            WeaponsFA18EF.STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_08_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             7,
@@ -7955,20 +8849,18 @@ class FA_18F(PlaneType):
             7,
             WeaponsFA18EF.STA_08_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             7,
-            WeaponsFA18EF.STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
-        STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank_ = (
+        STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_ = (
             7,
-            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank_,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_,
         )
-        STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis_ = (
+        STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis_ = (
             7,
-            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis_,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis_,
         )
-        # ERRR {SUPERHORNET_PYLON_09_IB_PD_1X_ALQ-167}
-        # ERRR {SUPERHORNET_PYLON_09_IB_PD_1X_ALQ-167}
         STA_08_SUU79_BRU32_1x_AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_ = (
             7,
             WeaponsFA18EF.STA_08_SUU79_BRU32_1x_AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_,
@@ -8073,7 +8965,6 @@ class FA_18F(PlaneType):
             7,
             WeaponsFA18EF.STA_08_SUU79_BRU33_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        # ERRR {SUPERHORNET_PYLON_09_IB_MK_BR2_ROCKEYE}
         STA_08_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             7,
             WeaponsFA18EF.STA_08_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
@@ -8135,10 +9026,62 @@ class FA_18F(PlaneType):
             WeaponsFA18EF.STA_09_08_SUU79_BRU32_1x_1x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
         STA_09_SUU79_EMPTY = (7, WeaponsFA18EF.STA_09_SUU79_EMPTY)
-        # ERRR <CLEAN>
-        # ERRR LAU-115_2*LAU-127_CATM-120C
-        # ERRR LAU_117_TGM_65E
-        # ERRR LAU_117_TGM_65F
+        STA_09_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_09_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_08_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_08_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_08_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_08_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_09_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_,
+        )
+        STA_09_08_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_09_08_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_,
+        )
+        STA_09_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_ = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_,
+        )
+        STA_09_08_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_ = (
+            7,
+            WeaponsFA18EF.STA_09_08_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_,
+        )
+        STA_09_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank,
+        )
+        STA_08_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank_ = (
+            7,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank_,
+        )
         LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar = (
             7,
             Weapons.LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar,
@@ -8226,9 +9169,9 @@ class FA_18F(PlaneType):
             8,
             WeaponsFA18EF.STA_10_SUU80_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             8,
-            WeaponsFA18EF.STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_10_SUU80_LAU117_1x_AGM_65E___Maverick_E__Laser_ASM___Lg_Whd_ = (
             8,
@@ -8322,9 +9265,9 @@ class FA_18F(PlaneType):
             8,
             WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM_,
         )
-        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__ = (
+        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = (
             8,
-            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__,
         )
         STA_09_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM_ = (
             8,
@@ -8334,9 +9277,9 @@ class FA_18F(PlaneType):
             8,
             WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM_,
         )
-        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__ = (
+        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = (
             8,
-            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__,
         )
         STA_09_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM_ = (
             8,
@@ -8470,87 +9413,115 @@ class FA_18F(PlaneType):
             8,
             WeaponsFA18EF.STA_09_SUU79_BRU33_2x_GBU_12___500lb_Laser_Guided_Bomb_,
         )
-        STA_09_10_79_80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM = (
+        STA_09_10_79___80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM,
         )
-        STA_09_10_79_80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM = (
+        STA_09_10_79___80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM,
         )
-        STA_09_10_79_80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
+        STA_09_10_79___80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
         )
-        STA_09_10_79_80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
+        STA_09_10_79___80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_09_10_79_80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_09_10_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
-        STA_09_10_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
+        STA_09_10_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
         )
-        STA_09_10_79_80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb = (
+        STA_09_10_79___80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb,
         )
-        STA_09_10_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
+        STA_09_10_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
         )
-        STA_09_10_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
+        STA_09_10_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
         )
-        STA_09_10_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+        STA_09_10_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
         )
-        STA_09_10_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
+        STA_09_10_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        STA_09_10_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
+        STA_09_10_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
-        STA_10_08_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
+        STA_10_08_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
             8,
-            WeaponsFA18EF.STA_10_08_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
+            WeaponsFA18EF.STA_10_08_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
         )
-        STA_10_08_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
+        STA_10_08_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             8,
-            WeaponsFA18EF.STA_10_08_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
+            WeaponsFA18EF.STA_10_08_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
         )
-        STA_10_08_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
+        STA_10_08_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
             8,
-            WeaponsFA18EF.STA_10_08_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_10_08_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
         )
-        STA_10_08_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+        STA_10_08_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
             8,
-            WeaponsFA18EF.STA_10_08_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
+            WeaponsFA18EF.STA_10_08_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
         )
-        STA_10_08_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
+        STA_10_08_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
             8,
-            WeaponsFA18EF.STA_10_08_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_10_08_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        STA_10_08_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
+        STA_10_08_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             8,
-            WeaponsFA18EF.STA_10_08_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
+            WeaponsFA18EF.STA_10_08_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
         STA_10_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X = (
             8,
             WeaponsFA18EF.STA_10_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X,
         )
         STA_10_SUU80_EMPTY = (8, WeaponsFA18EF.STA_10_SUU80_EMPTY)
-        # ERRR <CLEAN>
-        # ERRR {CATM-120C}
-        # ERRR {CATM-9M}
-        # ERRR {CATM-9X}
+        STA_10_SUU80_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            8,
+            WeaponsFA18EF.STA_10_SUU80_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_09_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__ = (
+            8,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__,
+        )
+        STA_09_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__ = (
+            8,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__,
+        )
+        STA_09_10_79___80_LAU127_1x_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            8,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            8,
+            WeaponsFA18EF.STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__ = (
+            8,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__,
+        )
+        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__ = (
+            8,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__,
+        )
+        STA_09_10_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            8,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
         LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar = (
             8,
             Weapons.LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar,
@@ -8607,11 +9578,15 @@ class FA_18F(PlaneType):
             9,
             WeaponsFA18EF.STA_11_WNGTP_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod,
         )
+        STA_11_WNGTP_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            9,
+            WeaponsFA18EF.STA_11_WNGTP_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
 
     class Pylon10:
-        STA_AX_FUEL_CELLS_1x_Internal_Auxillary_Fuel_Cells = (
+        STA_AX_FUEL_CELLS_1x_Internal_Auxillary_Fuel_Cells__570_GAL_ = (
             10,
-            WeaponsFA18EF.STA_AX_FUEL_CELLS_1x_Internal_Auxillary_Fuel_Cells,
+            WeaponsFA18EF.STA_AX_FUEL_CELLS_1x_Internal_Auxillary_Fuel_Cells__570_GAL_,
         )
         STA_AX_CKPIT_SMOKE_1x_Internal_Smoke_Generator___White = (
             10,
@@ -8664,7 +9639,7 @@ class EA_18G(PlaneType):
     height = 4.88
     width = 13.62456
     length = 18.31
-    fuel_max = 4900
+    fuel_max = 4482
     max_speed = 2120.04
     chaff = 60
     flare = 60
@@ -8747,18 +9722,25 @@ class EA_18G(PlaneType):
     property_defaults: Dict[str, Any] = {
         "SoloFlight": False,
         "AIRCRAFT_ID_SEQ": 0,
+        "DemoEquipment": False,
         "USA_FLAG": False,
         "BlockIIIEquip": True,
         "HelmetMountedDevice": 1,
         "HelmetMountedDeviceWSO": 1,
-        "RemoveLOutboard": False,
-        "RemoveLMidboard": False,
-        "RemoveLInboard": False,
-        "RemoveRInboard": False,
-        "RemoveRMidboard": False,
-        "RemoveROutboard": False,
+        "RemoveLOutboard": True,
+        "RemoveLMidboard": True,
+        "RemoveLInboard": True,
+        "RemoveLCheek": True,
+        "RemoveCenter": True,
+        "RemoveRCheek": True,
+        "RemoveRInboard": True,
+        "RemoveRMidboard": True,
+        "RemoveROutboard": True,
         "OuterBoard": 0,
         "InnerBoard": 0,
+        "VoiceCallsignLabel": None,
+        "VoiceCallsignNumber": None,
+        "STN_L16": None,
         "DYNAMIC_BORTS_MODE": 0,
         "DYNAMIC_BUNOS": False,
         "DYNAMIC_BUNO_01": 10,
@@ -8786,6 +9768,9 @@ class EA_18G(PlaneType):
                 Pattern_4E = 5
                 Pattern_5F = 6
 
+        class DemoEquipment:
+            id = "DemoEquipment"
+
         class USA_FLAG:
             id = "USA_FLAG"
 
@@ -8817,6 +9802,15 @@ class EA_18G(PlaneType):
         class RemoveLInboard:
             id = "RemoveLInboard"
 
+        class RemoveLCheek:
+            id = "RemoveLCheek"
+
+        class RemoveCenter:
+            id = "RemoveCenter"
+
+        class RemoveRCheek:
+            id = "RemoveRCheek"
+
         class RemoveRInboard:
             id = "RemoveRInboard"
 
@@ -8840,6 +9834,15 @@ class EA_18G(PlaneType):
                 Single = 0
                 Ripple = 1
 
+        class VoiceCallsignLabel:
+            id = "VoiceCallsignLabel"
+
+        class VoiceCallsignNumber:
+            id = "VoiceCallsignNumber"
+
+        class STN_L16:
+            id = "STN_L16"
+
         class DYNAMIC_BORTS_MODE:
             id = "DYNAMIC_BORTS_MODE"
 
@@ -8951,46 +9954,68 @@ class EA_18G(PlaneType):
                 Blank = 10
 
     properties = {
+        "WSO_Label": UnitPropertyDescription(
+            identifier="WSO_Label",
+            control="label",
+            label="Aircraft Crew Settings",
+            player_only=False,
+            x_lbl=150,
+        ),
         "SoloFlight": UnitPropertyDescription(
             identifier="SoloFlight",
-            control="comboList",
-            label="Solo Flight (Remove WSO)",
+            control="checkbox",
+            label="Solo Flight",
             player_only=False,
+            default=False,
+            weight_when_on=-80,
+        ),
+        "EQUIPMENT_Label": UnitPropertyDescription(
+            identifier="EQUIPMENT_Label",
+            control="label",
+            label="Aircraft / Pilot Equipment Settings",
+            player_only=False,
+            x_lbl=100,
+        ),
+        "AIRCRAFT_ID_SEQ": UnitPropertyDescription(
+            identifier="AIRCRAFT_ID_SEQ",
+            control="comboList",
+            label="Aircraft Strobe Sequence",
+            player_only=True,
             default=0,
             w_ctrl=150,
             values={
-                0: "False",
-                1: "True",
+                0: "Norm",
+                1: "Pattern 0A",
+                2: "Pattern 1B",
+                3: "Pattern 2C",
+                4: "Pattern 3D",
+                5: "Pattern 4E",
+                6: "Pattern 5F",
             },
         ),
+        "DemoEquipment": UnitPropertyDescription(
+            identifier="DemoEquipment",
+            control="checkbox",
+            label="USN Demo Team Equipment",
+            default=False,
+            weight_when_on=-140.2,
+        ),
         "USA_FLAG": UnitPropertyDescription(
             identifier="USA_FLAG",
-            control="comboList",
+            control="checkbox",
             label="Hood Displayed USA Flag",
-            player_only=False,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            default=False,
         ),
         "BlockIIIEquip": UnitPropertyDescription(
             identifier="BlockIIIEquip",
-            control="comboList",
+            control="checkbox",
             label="Block III Antennas (Cosmetic)",
-            player_only=False,
-            default=1,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            default=True,
         ),
         "HelmetMountedDevice": UnitPropertyDescription(
             identifier="HelmetMountedDevice",
             control="comboList",
-            label="Helmet Mounted Device",
+            label="Pilot Helmet Mounted Device",
             player_only=True,
             default=1,
             w_ctrl=150,
@@ -9013,77 +10038,89 @@ class EA_18G(PlaneType):
                 2: "NVG",
             },
         ),
+        "EQUIPMENT_Label": UnitPropertyDescription(
+            identifier="EQUIPMENT_Label",
+            control="label",
+            label="Additional Pylon Control",
+            player_only=False,
+            x_lbl=100,
+        ),
+        "EQUIPMENT_Label_USER": UnitPropertyDescription(
+            identifier="EQUIPMENT_Label_USER",
+            control="label",
+            label="*(User req. to remove stores)",
+            player_only=False,
+            x_lbl=100,
+        ),
         "RemoveLOutboard": UnitPropertyDescription(
             identifier="RemoveLOutboard",
-            control="comboList",
-            label="Dismount STA 2 SUU-80A Pylon (Left Outboard)",
-            player_only=False,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            control="checkbox",
+            label="Mount STA 2 SUU-80A Pylon",
+            default=True,
+            weight_when_on=55.79,
         ),
         "RemoveLMidboard": UnitPropertyDescription(
             identifier="RemoveLMidboard",
-            control="comboList",
-            label="Dismount STA 3 SUU-79A Pylon (Left Midboard)",
-            player_only=False,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            control="checkbox",
+            label="Mount STA 3 SUU-79A Pylon",
+            default=True,
+            weight_when_on=163.29,
         ),
         "RemoveLInboard": UnitPropertyDescription(
-            identifier="RemoveLMidboard",
-            control="comboList",
-            label="Dismount STA 4 SUU-79A Pylon (Left Inboard)",
-            player_only=False,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            identifier="RemoveLInboard",
+            control="checkbox",
+            label="Mount STA 4 SUU-79A Pylon",
+            default=True,
+            weight_when_on=163.29,
+        ),
+        "RemoveLCheek": UnitPropertyDescription(
+            identifier="RemoveLCheek",
+            control="checkbox",
+            label="Mount STA 5 LAU-115 Pylon",
+            default=True,
+            weight_when_on=30.84,
+        ),
+        "RemoveCenter": UnitPropertyDescription(
+            identifier="RemoveCenter",
+            control="checkbox",
+            label="Mount STA 6 SUU-78A Pylon",
+            default=True,
+            weight_when_on=83,
+        ),
+        "RemoveRCheek": UnitPropertyDescription(
+            identifier="RemoveRCheek",
+            control="checkbox",
+            label="Mount STA 7 LAU-115 Pylon",
+            default=True,
+            weight_when_on=30.84,
         ),
         "RemoveRInboard": UnitPropertyDescription(
             identifier="RemoveRInboard",
-            control="comboList",
-            label="Dismount STA 8 SUU-79A Pylon (Right Inboard)",
-            player_only=False,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            control="checkbox",
+            label="Mount STA 8 SUU-79A Pylon",
+            default=True,
+            weight_when_on=163.29,
         ),
         "RemoveRMidboard": UnitPropertyDescription(
-            identifier="RemoveRInboard",
-            control="comboList",
-            label="Dismount STA 9 SUU-79A Pylon (Right Midboard)",
-            player_only=False,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            identifier="RemoveRMidboard",
+            control="checkbox",
+            label="Mount STA 9 SUU-79A Pylon",
+            default=True,
+            weight_when_on=163.29,
         ),
         "RemoveROutboard": UnitPropertyDescription(
             identifier="RemoveROutboard",
-            control="comboList",
-            label="Dismount STA 10 SUU-80A Pylon (Right Outboard)",
-            player_only=False,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            control="checkbox",
+            label="Mount STA 10 SUU-80A Pylon",
+            default=True,
+            weight_when_on=55.79,
+        ),
+        "ROCKETS_Label": UnitPropertyDescription(
+            identifier="ROCKETS_Label",
+            control="label",
+            label="Aircraft Rocket Settings",
+            player_only=True,
+            x_lbl=100,
         ),
         "OuterBoard": UnitPropertyDescription(
             identifier="OuterBoard",
@@ -9112,9 +10149,9 @@ class EA_18G(PlaneType):
         "datalink_Label": UnitPropertyDescription(
             identifier="datalink_Label",
             control="label",
-            label="DATALINK",
+            label="Datalink Settings",
             player_only=False,
-            x_lbl=150,
+            x_lbl=100,
         ),
         "VoiceCallsignLabel": UnitPropertyDescription(
             identifier="VoiceCallsignLabel",
@@ -9134,18 +10171,173 @@ class EA_18G(PlaneType):
             label="STN",
             player_only=False,
         ),
+        "DYNAMIC_BORTS": UnitPropertyDescription(
+            identifier="DYNAMIC_BORTS",
+            control="label",
+            label="Aircraft Identification Stencils",
+            player_only=False,
+            x_lbl=100,
+        ),
+        "DYNAMIC_BORTS_MODE": UnitPropertyDescription(
+            identifier="DYNAMIC_BORTS_MODE",
+            control="comboList",
+            label="Aircraft Identification Type",
+            player_only=False,
+            default=0,
+            w_ctrl=150,
+            values={
+                0: "DISABLED / NONE",
+                1: "USN STANDARD",
+                2: "RAAF FIGHTER",
+                3: "RAAF GROWLER",
+                4: "KAF LEGACY",
+                5: "KAF SUPER HORNET",
+            },
+        ),
+        "DYNAMIC_BUNOS": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNOS",
+            control="checkbox",
+            label="Aircraft Identification BUNO",
+            default=False,
+        ),
+        "DYNAMIC_BUNO_01": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_01",
+            control="comboList",
+            label="Aircraft BUNO Digit #1",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_02": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_02",
+            control="comboList",
+            label="Aircraft BUNO Digit #2",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_03": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_03",
+            control="comboList",
+            label="Aircraft BUNO Digit #3",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_04": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_04",
+            control="comboList",
+            label="Aircraft BUNO Digit #4",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_05": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_05",
+            control="comboList",
+            label="Aircraft BUNO Digit #5",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_06": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_06",
+            control="comboList",
+            label="Aircraft BUNO Digit #6",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
     }
 
     livery_name = "EA-18G"  # from livery_entry
 
     class Pylon1:
-        STA_02_SUU80_LA127_1x_AIM_9M_Sidewinder_IR_AAM_ = (
+        STA_02_SUU80_LAU127_1x_AIM_9M_Sidewinder_IR_AAM__ = (
             1,
-            WeaponsEA18G.STA_02_SUU80_LA127_1x_AIM_9M_Sidewinder_IR_AAM_,
+            WeaponsEA18G.STA_02_SUU80_LAU127_1x_AIM_9M_Sidewinder_IR_AAM__,
         )
-        STA_02_SUU80_LA127_1x_AIM_9X_Sidewinder_IR_AAM_ = (
+        STA_02_SUU80_LAU127_1x_AIM_9X_Sidewinder_IR_AAM__ = (
             1,
-            WeaponsEA18G.STA_02_SUU80_LA127_1x_AIM_9X_Sidewinder_IR_AAM_,
+            WeaponsEA18G.STA_02_SUU80_LAU127_1x_AIM_9X_Sidewinder_IR_AAM__,
         )
         STA_03_SUU79_BRU32_1x_AN_ALQ_99_ICAP_III_High_Band_Jamming_Pod = (
             1,
@@ -9155,228 +10347,244 @@ class EA_18G(PlaneType):
             1,
             WeaponsEA18G.STA_03_SUU79_BRU32_1x_AN_ALQ_249_Mid_Band_Next_Generation_Jamming_Pod,
         )
-        STA_02_SUU80_LA127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X_ = (
+        STA_03_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = (
             1,
-            WeaponsEA18G.STA_02_SUU80_LA127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X_,
+            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank,
+        )
+        STA_02_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X__ = (
+            1,
+            WeaponsEA18G.STA_02_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X__,
         )
-
-    # ERRR <CLEAN>
 
     class Pylon2:
-        STA_02_SUU80_LA118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = (
+        STA_02_SUU80_LAU118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_ = (
             2,
-            WeaponsEA18G.STA_02_SUU80_LA118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile,
+            WeaponsEA18G.STA_02_SUU80_LAU118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_,
         )
-        STA_02_SUU80_LA115_1x_AIM_7M_Sparrow_Semi_Active_Radar = (
+        STA_02_SUU80_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar_ = (
             2,
-            WeaponsEA18G.STA_02_SUU80_LA115_1x_AIM_7M_Sparrow_Semi_Active_Radar,
+            WeaponsEA18G.STA_02_SUU80_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar_,
         )
-        STA_02_SUU80_LA127_1x_AIM_9M_Sidewinder_IR_AAM = (
+        STA_02_SUU80_LAU115_1x_AIM_7F_Sparrow_Semi_Active_Radar_ = (
             2,
-            WeaponsEA18G.STA_02_SUU80_LA127_1x_AIM_9M_Sidewinder_IR_AAM,
+            WeaponsEA18G.STA_02_SUU80_LAU115_1x_AIM_7F_Sparrow_Semi_Active_Radar_,
         )
-        STA_02_SUU80_LA127_1x_AIM_9X_Sidewinder_IR_AAM = (
+        STA_02_SUU80_LAU115_1x_AIM_7MH_Sparrow_Semi_Active_Radar_ = (
             2,
-            WeaponsEA18G.STA_02_SUU80_LA127_1x_AIM_9X_Sidewinder_IR_AAM,
+            WeaponsEA18G.STA_02_SUU80_LAU115_1x_AIM_7MH_Sparrow_Semi_Active_Radar_,
         )
-        # ERRR {GROWLER_PYLON_02_OB_Sw_1X_CATM-9M}
-        STA_02_SUU80_LA127_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
+        STA_02_SUU80_LAU115_1x_AIM_7P_Sparrow_Semi_Active_Radar_ = (
             2,
-            WeaponsEA18G.STA_02_SUU80_LA127_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
+            WeaponsEA18G.STA_02_SUU80_LAU115_1x_AIM_7P_Sparrow_Semi_Active_Radar_,
         )
-        STA_02_SUU80_LA127_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
+        STA_02_SUU80_LAU127_1x_AIM_9M_Sidewinder_IR_AAM_ = (
             2,
-            WeaponsEA18G.STA_02_SUU80_LA127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
+            WeaponsEA18G.STA_02_SUU80_LAU127_1x_AIM_9M_Sidewinder_IR_AAM_,
         )
-        STA_02_SUU80_LA127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_02_SUU80_LAU127_1x_AIM_9X_Sidewinder_IR_AAM_ = (
             2,
-            WeaponsEA18G.STA_02_SUU80_LA127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsEA18G.STA_02_SUU80_LAU127_1x_AIM_9X_Sidewinder_IR_AAM_,
         )
-        STA_02_SUU80_LA127_1x_AN_ASQ_T50_V_1_TCTS_Pod = (
+        STA_02_SUU80_LAU127_1x_AIM_120B_AMRAAM___Active_Radar_AAM_ = (
             2,
-            WeaponsEA18G.STA_02_SUU80_LA127_1x_AN_ASQ_T50_V_1_TCTS_Pod,
+            WeaponsEA18G.STA_02_SUU80_LAU127_1x_AIM_120B_AMRAAM___Active_Radar_AAM_,
         )
-        STA_03_SUU79_LA127_1x_AIM_9M_Sidewinder_IR_AAM = (
+        STA_02_SUU80_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM_ = (
             2,
-            WeaponsEA18G.STA_03_SUU79_LA127_1x_AIM_9M_Sidewinder_IR_AAM,
+            WeaponsEA18G.STA_02_SUU80_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM_,
         )
-        STA_03_SUU79_LA127_1x_AIM_9X_Sidewinder_IR_AAM = (
+        STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = (
             2,
-            WeaponsEA18G.STA_03_SUU79_LA127_1x_AIM_9X_Sidewinder_IR_AAM,
+            WeaponsEA18G.STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__,
         )
-        STA_03_SUU79_LA127_2x_AIM_9M_Sidewinder_IR_AAM = (
+        STA_02_SUU80_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod_ = (
             2,
-            WeaponsEA18G.STA_03_SUU79_LA127_2x_AIM_9M_Sidewinder_IR_AAM,
+            WeaponsEA18G.STA_02_SUU80_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod_,
         )
-        STA_03_SUU79_LA127_2x_AIM_9X_Sidewinder_IR_AAM = (
+        STA_03_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM__ = (
             2,
-            WeaponsEA18G.STA_03_SUU79_LA127_2x_AIM_9X_Sidewinder_IR_AAM,
+            WeaponsEA18G.STA_03_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM__,
         )
-        STA_03_SUU79_LA127_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
+        STA_03_SUU79_LAU127_1x_AIM_9X_Sidewinder_IR_AAM__ = (
             2,
-            WeaponsEA18G.STA_03_SUU79_LA127_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
+            WeaponsEA18G.STA_03_SUU79_LAU127_1x_AIM_9X_Sidewinder_IR_AAM__,
         )
-        STA_03_SUU79_LA127_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
+        STA_03_SUU79_LAU127_2x_AIM_9M_Sidewinder_IR_AAM__ = (
             2,
-            WeaponsEA18G.STA_03_SUU79_LA127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
+            WeaponsEA18G.STA_03_SUU79_LAU127_2x_AIM_9M_Sidewinder_IR_AAM__,
         )
-        STA_03_SUU79_LA127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_03_SUU79_LAU127_2x_AIM_9X_Sidewinder_IR_AAM__ = (
             2,
-            WeaponsEA18G.STA_03_SUU79_LA127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsEA18G.STA_03_SUU79_LAU127_2x_AIM_9X_Sidewinder_IR_AAM__,
         )
-        STA_03_SUU79_LA127_2x_AIM_120B_AMRAAM___Active_Radar_AAM = (
+        STA_03_SUU79_LAU127_1x_AIM_120B_AMRAAM___Active_Radar_AAM__ = (
             2,
-            WeaponsEA18G.STA_03_SUU79_LA127_2x_AIM_120B_AMRAAM___Active_Radar_AAM,
+            WeaponsEA18G.STA_03_SUU79_LAU127_1x_AIM_120B_AMRAAM___Active_Radar_AAM__,
         )
-        STA_03_SUU79_LA127_2x_AIM_120C_AMRAAM___Active_Radar_AAM = (
+        STA_03_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM__ = (
             2,
-            WeaponsEA18G.STA_03_SUU79_LA127_2x_AIM_120C_AMRAAM___Active_Radar_AAM,
+            WeaponsEA18G.STA_03_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM__,
         )
-        STA_03_SUU79_LA127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only___ = (
             2,
-            WeaponsEA18G.STA_03_SUU79_LA127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsEA18G.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only___,
         )
-        STA_03_SUU79_LA118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = (
+        STA_03_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM__ = (
             2,
-            WeaponsEA18G.STA_03_SUU79_LA118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile,
+            WeaponsEA18G.STA_03_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM__,
         )
-        STA_03_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = (
+        STA_03_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM__ = (
             2,
-            WeaponsEA18G.STA_03_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank,
+            WeaponsEA18G.STA_03_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM__,
         )
-        STA_02_SUU80_LA127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X = (
+        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only___ = (
             2,
-            WeaponsEA18G.STA_02_SUU80_LA127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X,
+            WeaponsEA18G.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only___,
+        )
+        STA_03_SUU79_LAU118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_ = (
+            2,
+            WeaponsEA18G.STA_03_SUU79_LAU118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_,
+        )
+        STA_03_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_ = (
+            2,
+            WeaponsEA18G.STA_03_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_,
+        )
+        STA_02_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X_ = (
+            2,
+            WeaponsEA18G.STA_02_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X_,
         )
-
-    # ERRR <CLEAN>
 
     class Pylon3:
-        STA_04_SUU79_LA127_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
+        STA_04_SUU79_LAU127_1x_AIM_120B_AMRAAM___Active_Radar_AAM_ = (
             3,
-            WeaponsEA18G.STA_04_SUU79_LA127_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
+            WeaponsEA18G.STA_04_SUU79_LAU127_1x_AIM_120B_AMRAAM___Active_Radar_AAM_,
         )
-        STA_04_SUU79_LA127_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
+        STA_04_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM_ = (
             3,
-            WeaponsEA18G.STA_04_SUU79_LA127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
+            WeaponsEA18G.STA_04_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM_,
         )
-        STA_04_SUU79_LA127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = (
             3,
-            WeaponsEA18G.STA_04_SUU79_LA127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsEA18G.STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__,
         )
-        STA_04_SUU79_LA127_2x_AIM_120B_AMRAAM___Active_Radar_AAM = (
+        STA_04_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM_ = (
             3,
-            WeaponsEA18G.STA_04_SUU79_LA127_2x_AIM_120B_AMRAAM___Active_Radar_AAM,
+            WeaponsEA18G.STA_04_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM_,
         )
-        STA_04_SUU79_LA127_2x_AIM_120C_AMRAAM___Active_Radar_AAM = (
+        STA_04_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM_ = (
             3,
-            WeaponsEA18G.STA_04_SUU79_LA127_2x_AIM_120C_AMRAAM___Active_Radar_AAM,
+            WeaponsEA18G.STA_04_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM_,
         )
-        STA_04_SUU79_LA127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = (
             3,
-            WeaponsEA18G.STA_04_SUU79_LA127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsEA18G.STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__,
         )
-        STA_04_SUU79_LA127_1x_AIM_9M_Sidewinder_IR_AAM = (
+        STA_04_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM_ = (
             3,
-            WeaponsEA18G.STA_04_SUU79_LA127_1x_AIM_9M_Sidewinder_IR_AAM,
+            WeaponsEA18G.STA_04_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM_,
         )
-        STA_04_SUU79_LA127_2x_AIM_9M_Sidewinder_IR_AAM = (
+        STA_04_SUU79_LAU127_2x_AIM_9M_Sidewinder_IR_AAM_ = (
             3,
-            WeaponsEA18G.STA_04_SUU79_LA127_2x_AIM_9M_Sidewinder_IR_AAM,
+            WeaponsEA18G.STA_04_SUU79_LAU127_2x_AIM_9M_Sidewinder_IR_AAM_,
         )
-        STA_04_SUU79_LA127_1x_AIM_9X_Sidewinder_IR_AAM = (
+        STA_04_SUU79_LAU127_1x_AIM_9X_Sidewinder_IR_AAM_ = (
             3,
-            WeaponsEA18G.STA_04_SUU79_LA127_1x_AIM_9X_Sidewinder_IR_AAM,
+            WeaponsEA18G.STA_04_SUU79_LAU127_1x_AIM_9X_Sidewinder_IR_AAM_,
         )
-        STA_04_SUU79_LA127_2x_AIM_9X_Sidewinder_IR_AAM = (
+        STA_04_SUU79_LAU127_2x_AIM_9X_Sidewinder_IR_AAM_ = (
             3,
-            WeaponsEA18G.STA_04_SUU79_LA127_2x_AIM_9X_Sidewinder_IR_AAM,
+            WeaponsEA18G.STA_04_SUU79_LAU127_2x_AIM_9X_Sidewinder_IR_AAM_,
         )
-        STA_04_SUU79_LA127_1x_Captive_AIM_9M_for_ACM = (
+        STA_04_SUU79_LAU127_1x_Captive_AIM_9M_for_ACM_ = (
             3,
-            WeaponsEA18G.STA_04_SUU79_LA127_1x_Captive_AIM_9M_for_ACM,
+            WeaponsEA18G.STA_04_SUU79_LAU127_1x_Captive_AIM_9M_for_ACM_,
         )
-        STA_04_SUU79_LA127_2x_Captive_AIM_9M_for_ACM = (
+        STA_04_SUU79_LAU127_2x_Captive_AIM_9M_for_ACM_ = (
             3,
-            WeaponsEA18G.STA_04_SUU79_LA127_2x_Captive_AIM_9M_for_ACM,
+            WeaponsEA18G.STA_04_SUU79_LAU127_2x_Captive_AIM_9M_for_ACM_,
         )
-        STA_04_SUU80_LA118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = (
+        STA_04_SUU80_LAU118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = (
             3,
-            WeaponsEA18G.STA_04_SUU80_LA118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile,
+            WeaponsEA18G.STA_04_SUU80_LAU118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile,
         )
-        STA_04_SUU79_BRU32_1x_AGM_154A___JSOW_CEB__CBU_type_ = (
+        STA_04_SUU79_BRU32_1x_AGM_154A___JSOW_CEB__CBU_type__ = (
             3,
-            WeaponsEA18G.STA_04_SUU79_BRU32_1x_AGM_154A___JSOW_CEB__CBU_type_,
+            WeaponsEA18G.STA_04_SUU79_BRU32_1x_AGM_154A___JSOW_CEB__CBU_type__,
         )
-        STA_04_SUU79_BRU55_1x_AGM_154A___JSOW_CEB__CBU_type_ = (
+        STA_04_SUU79_BRU55_1x_AGM_154A___JSOW_CEB__CBU_type__ = (
             3,
-            WeaponsEA18G.STA_04_SUU79_BRU55_1x_AGM_154A___JSOW_CEB__CBU_type_,
+            WeaponsEA18G.STA_04_SUU79_BRU55_1x_AGM_154A___JSOW_CEB__CBU_type__,
         )
-        STA_04_SUU79_BRU55_2x_AGM_154A___JSOW_CEB__CBU_type_ = (
+        STA_04_SUU79_BRU55_2x_AGM_154A___JSOW_CEB__CBU_type__ = (
             3,
-            WeaponsEA18G.STA_04_SUU79_BRU55_2x_AGM_154A___JSOW_CEB__CBU_type_,
+            WeaponsEA18G.STA_04_SUU79_BRU55_2x_AGM_154A___JSOW_CEB__CBU_type__,
         )
-        STA_04_SUU79_BRU32_1x_AGM_154C___JSOW_Unitary_BROACH = (
+        STA_04_SUU79_BRU32_1x_AGM_154C___JSOW_Unitary_BROACH_ = (
             3,
-            WeaponsEA18G.STA_04_SUU79_BRU32_1x_AGM_154C___JSOW_Unitary_BROACH,
+            WeaponsEA18G.STA_04_SUU79_BRU32_1x_AGM_154C___JSOW_Unitary_BROACH_,
         )
-        STA_04_SUU79_BRU55_1x_AGM_154C___JSOW_Unitary_BROACH = (
+        STA_04_SUU79_BRU55_1x_AGM_154C___JSOW_Unitary_BROACH_ = (
             3,
-            WeaponsEA18G.STA_04_SUU79_BRU55_1x_AGM_154C___JSOW_Unitary_BROACH,
+            WeaponsEA18G.STA_04_SUU79_BRU55_1x_AGM_154C___JSOW_Unitary_BROACH_,
         )
-        STA_04_SUU79_BRU55_2x_AGM_154C___JSOW_Unitary_BROACH = (
+        STA_04_SUU79_BRU55_2x_AGM_154C___JSOW_Unitary_BROACH_ = (
             3,
-            WeaponsEA18G.STA_04_SUU79_BRU55_2x_AGM_154C___JSOW_Unitary_BROACH,
+            WeaponsEA18G.STA_04_SUU79_BRU55_2x_AGM_154C___JSOW_Unitary_BROACH_,
         )
-        STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = (
+        STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank__ = (
             3,
-            WeaponsEA18G.STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank,
+            WeaponsEA18G.STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank__,
         )
-        STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = (
+        STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis__ = (
             3,
-            WeaponsEA18G.STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis,
+            WeaponsEA18G.STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis__,
+        )
+        STA_04_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank_ = (
+            3,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank_,
         )
-
-    # ERRR <CLEAN>
 
     class Pylon4:
-        STA_05_LA116_LA116_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
+        STA_05_LA116_LAU116_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             4,
-            WeaponsEA18G.STA_05_LA116_LA116_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
+            WeaponsEA18G.STA_05_LA116_LAU116_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
         )
-        STA_05_LA116_LA116_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
+        STA_05_LA116_LAU116_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
             4,
-            WeaponsEA18G.STA_05_LA116_LA116_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
+            WeaponsEA18G.STA_05_LA116_LAU116_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_05_LA116_LA116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_05_LA116_LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             4,
-            WeaponsEA18G.STA_05_LA116_LA116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsEA18G.STA_05_LA116_LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
-        STA_05_LA116_LA116_1x_AIM_7M_Sparrow_Semi_Active_Radar = (
+        STA_05_LA116_LAU116_1x_AIM_7M_Sparrow_Semi_Active_Radar = (
             4,
-            WeaponsEA18G.STA_05_LA116_LA116_1x_AIM_7M_Sparrow_Semi_Active_Radar,
+            WeaponsEA18G.STA_05_LA116_LAU116_1x_AIM_7M_Sparrow_Semi_Active_Radar,
         )
-        STA_05_LA116_LA116_1x_AIM_7F_Sparrow_Semi_Active_Radar = (
+        STA_05_LA116_LAU116_1x_AIM_7F_Sparrow_Semi_Active_Radar = (
             4,
-            WeaponsEA18G.STA_05_LA116_LA116_1x_AIM_7F_Sparrow_Semi_Active_Radar,
+            WeaponsEA18G.STA_05_LA116_LAU116_1x_AIM_7F_Sparrow_Semi_Active_Radar,
         )
-        STA_05_LA116_LA116_1x_AIM_7MH_Sparrow_Semi_Active_Radar = (
+        STA_05_LA116_LAU116_1x_AIM_7MH_Sparrow_Semi_Active_Radar = (
             4,
-            WeaponsEA18G.STA_05_LA116_LA116_1x_AIM_7MH_Sparrow_Semi_Active_Radar,
+            WeaponsEA18G.STA_05_LA116_LAU116_1x_AIM_7MH_Sparrow_Semi_Active_Radar,
         )
-        STA_05_LA116_LA116_1x_AIM_7P_Sparrow_Semi_Active_Radar = (
+        STA_05_LA116_LAU116_1x_AIM_7P_Sparrow_Semi_Active_Radar = (
             4,
-            WeaponsEA18G.STA_05_LA116_LA116_1x_AIM_7P_Sparrow_Semi_Active_Radar,
+            WeaponsEA18G.STA_05_LA116_LAU116_1x_AIM_7P_Sparrow_Semi_Active_Radar,
         )
         STA_05_LA116_TPMNT_1x_AN_ASQ_228_ATFLIR___Targeting_Pod = (
             4,
             WeaponsEA18G.STA_05_LA116_TPMNT_1x_AN_ASQ_228_ATFLIR___Targeting_Pod,
         )
-        STA_05_LA116_LA116_Empty_AIM_7_120_Ejectors = (
+        STA_05_LA116_TPMNT_Empty_Weapon_Replacable_Assembly__WRA__Adapter = (
             4,
-            WeaponsEA18G.STA_05_LA116_LA116_Empty_AIM_7_120_Ejectors,
+            WeaponsEA18G.STA_05_LA116_TPMNT_Empty_Weapon_Replacable_Assembly__WRA__Adapter,
+        )
+        STA_05_LA116_LAU116_Empty_AIM_7_120_Ejectors = (
+            4,
+            WeaponsEA18G.STA_05_LA116_LAU116_Empty_AIM_7_120_Ejectors,
         )
-        # ERRR <CLEAN>
         AIM_7F_Sparrow_Semi_Active_Radar = (4, Weapons.AIM_7F_Sparrow_Semi_Active_Radar)
         AIM_7MH_Sparrow_Semi_Active_Radar = (
             4,
@@ -9385,54 +10593,64 @@ class EA_18G(PlaneType):
         AIM_7P_Sparrow_Semi_Active_Radar = (4, Weapons.AIM_7P_Sparrow_Semi_Active_Radar)
 
     class Pylon5:
-        STA_06_SUU78_BRU32_1x_FPU_12_A_Fuel_Tank = (
+        STA_06_SUU78_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_ = (
             5,
-            WeaponsEA18G.STA_06_SUU78_BRU32_1x_FPU_12_A_Fuel_Tank,
+            WeaponsEA18G.STA_06_SUU78_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_,
         )
-        STA_06_SUU78_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = (
+        STA_06_SUU78_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis_ = (
             5,
-            WeaponsEA18G.STA_06_SUU78_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis,
+            WeaponsEA18G.STA_06_SUU78_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis_,
         )
-        STA_06_SUU78_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod = (
+        STA_06_SUU78_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod_ = (
             5,
-            WeaponsEA18G.STA_06_SUU78_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod,
+            WeaponsEA18G.STA_06_SUU78_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod_,
         )
         STA_06_SUU78_BRU32_1x_AN_ALQ_99_ICAP_III_Low_Band_Jamming_Pod = (
             5,
             WeaponsEA18G.STA_06_SUU78_BRU32_1x_AN_ALQ_99_ICAP_III_Low_Band_Jamming_Pod,
         )
-        STA_06_SUU78_EMPTY_ = (5, WeaponsEA18G.STA_06_SUU78_EMPTY_)
-
-    # ERRR <CLEAN>
+        STA_06_SUU78_BRU32_1x_AN_AAQ_28_LITENING___Targeting_Pod = (
+            5,
+            WeaponsEA18G.STA_06_SUU78_BRU32_1x_AN_AAQ_28_LITENING___Targeting_Pod,
+        )
+        STA_06_SUU78_BRU32_1x_FPU_13_A__340_GAL__with_ASG_34A_V_1_Infrared_Search_and_Track_System___FUEL_ONLY__ = (
+            5,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_13_A__340_GAL__with_ASG_34A_V_1_Infrared_Search_and_Track_System___FUEL_ONLY__,
+        )
+        STA_06_SUU78_EMPTY = (5, WeaponsEA18G.STA_06_SUU78_EMPTY)
+        STA_06_SUU78_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = (
+            5,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank,
+        )
 
     class Pylon6:
-        STA_07_LA116_LA116_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
+        STA_07_LA116_LAU116_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             6,
-            WeaponsEA18G.STA_07_LA116_LA116_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
+            WeaponsEA18G.STA_07_LA116_LAU116_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
         )
-        STA_07_LA116_LA116_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
+        STA_07_LA116_LAU116_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
             6,
-            WeaponsEA18G.STA_07_LA116_LA116_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
+            WeaponsEA18G.STA_07_LA116_LAU116_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_07_LA116_LA116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_07_LA116_LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             6,
-            WeaponsEA18G.STA_07_LA116_LA116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsEA18G.STA_07_LA116_LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
-        STA_07_LA116_LA116_1x_AIM_7M_Sparrow_Semi_Active_Radar = (
+        STA_07_LA116_LAU116_1x_AIM_7M_Sparrow_Semi_Active_Radar = (
             6,
-            WeaponsEA18G.STA_07_LA116_LA116_1x_AIM_7M_Sparrow_Semi_Active_Radar,
+            WeaponsEA18G.STA_07_LA116_LAU116_1x_AIM_7M_Sparrow_Semi_Active_Radar,
         )
-        STA_07_LA116_LA116_1x_AIM_7F_Sparrow_Semi_Active_Radar = (
+        STA_07_LA116_LAU116_1x_AIM_7F_Sparrow_Semi_Active_Radar = (
             6,
-            WeaponsEA18G.STA_07_LA116_LA116_1x_AIM_7F_Sparrow_Semi_Active_Radar,
+            WeaponsEA18G.STA_07_LA116_LAU116_1x_AIM_7F_Sparrow_Semi_Active_Radar,
         )
-        STA_07_LA116_LA116_1x_AIM_7MH_Sparrow_Semi_Active_Radar = (
+        STA_07_LA116_LAU116_1x_AIM_7MH_Sparrow_Semi_Active_Radar = (
             6,
-            WeaponsEA18G.STA_07_LA116_LA116_1x_AIM_7MH_Sparrow_Semi_Active_Radar,
+            WeaponsEA18G.STA_07_LA116_LAU116_1x_AIM_7MH_Sparrow_Semi_Active_Radar,
         )
-        STA_07_LA116_LA116_1x_AIM_7P_Sparrow_Semi_Active_Radar = (
+        STA_07_LA116_LAU116_1x_AIM_7P_Sparrow_Semi_Active_Radar = (
             6,
-            WeaponsEA18G.STA_07_LA116_LA116_1x_AIM_7P_Sparrow_Semi_Active_Radar,
+            WeaponsEA18G.STA_07_LA116_LAU116_1x_AIM_7P_Sparrow_Semi_Active_Radar,
         )
         AIM_7F_Sparrow_Semi_Active_Radar = (6, Weapons.AIM_7F_Sparrow_Semi_Active_Radar)
         AIM_7MH_Sparrow_Semi_Active_Radar = (
@@ -9440,198 +10658,207 @@ class EA_18G(PlaneType):
             Weapons.AIM_7MH_Sparrow_Semi_Active_Radar,
         )
         AIM_7P_Sparrow_Semi_Active_Radar = (6, Weapons.AIM_7P_Sparrow_Semi_Active_Radar)
-        STA_05_LA116_LA116_Empty_AIM_7_120_Ejectors = (
+        STA_05_LA116_LAU116_Empty_AIM_7_120_Ejectors = (
             6,
-            WeaponsEA18G.STA_05_LA116_LA116_Empty_AIM_7_120_Ejectors,
+            WeaponsEA18G.STA_05_LA116_LAU116_Empty_AIM_7_120_Ejectors,
         )
 
-    # ERRR <CLEAN>
-
     class Pylon7:
-        STA_08_SUU79_LA127_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
+        STA_08_SUU79_LAU127_1x_AIM_120B_AMRAAM___Active_Radar_AAM_ = (
             7,
-            WeaponsEA18G.STA_08_SUU79_LA127_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
+            WeaponsEA18G.STA_08_SUU79_LAU127_1x_AIM_120B_AMRAAM___Active_Radar_AAM_,
         )
-        STA_08_SUU79_LA127_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
+        STA_08_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM_ = (
             7,
-            WeaponsEA18G.STA_08_SUU79_LA127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
+            WeaponsEA18G.STA_08_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM_,
         )
-        STA_08_SUU79_LA127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = (
             7,
-            WeaponsEA18G.STA_08_SUU79_LA127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsEA18G.STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__,
         )
-        STA_08_SUU79_LA127_2x_AIM_120B_AMRAAM___Active_Radar_AAM = (
+        STA_08_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM_ = (
             7,
-            WeaponsEA18G.STA_08_SUU79_LA127_2x_AIM_120B_AMRAAM___Active_Radar_AAM,
+            WeaponsEA18G.STA_08_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM_,
         )
-        STA_08_SUU79_LA127_2x_AIM_120C_AMRAAM___Active_Radar_AAM = (
+        STA_08_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM_ = (
             7,
-            WeaponsEA18G.STA_08_SUU79_LA127_2x_AIM_120C_AMRAAM___Active_Radar_AAM,
+            WeaponsEA18G.STA_08_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM_,
         )
-        STA_08_SUU79_LA127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = (
             7,
-            WeaponsEA18G.STA_08_SUU79_LA127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsEA18G.STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__,
         )
-        STA_08_SUU79_LA127_1x_AIM_9M_Sidewinder_IR_AAM = (
+        STA_08_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM_ = (
             7,
-            WeaponsEA18G.STA_08_SUU79_LA127_1x_AIM_9M_Sidewinder_IR_AAM,
+            WeaponsEA18G.STA_08_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM_,
         )
-        STA_08_SUU79_LA127_2x_AIM_9M_Sidewinder_IR_AAM = (
+        STA_08_SUU79_LAU127_2x_AIM_9M_Sidewinder_IR_AAM_ = (
             7,
-            WeaponsEA18G.STA_08_SUU79_LA127_2x_AIM_9M_Sidewinder_IR_AAM,
+            WeaponsEA18G.STA_08_SUU79_LAU127_2x_AIM_9M_Sidewinder_IR_AAM_,
         )
-        STA_08_SUU79_LA127_1x_AIM_9X_Sidewinder_IR_AAM = (
+        STA_08_SUU79_LAU127_1x_AIM_9X_Sidewinder_IR_AAM_ = (
             7,
-            WeaponsEA18G.STA_08_SUU79_LA127_1x_AIM_9X_Sidewinder_IR_AAM,
+            WeaponsEA18G.STA_08_SUU79_LAU127_1x_AIM_9X_Sidewinder_IR_AAM_,
         )
-        STA_08_SUU79_LA127_2x_AIM_9X_Sidewinder_IR_AAM = (
+        STA_08_SUU79_LAU127_2x_AIM_9X_Sidewinder_IR_AAM_ = (
             7,
-            WeaponsEA18G.STA_08_SUU79_LA127_2x_AIM_9X_Sidewinder_IR_AAM,
+            WeaponsEA18G.STA_08_SUU79_LAU127_2x_AIM_9X_Sidewinder_IR_AAM_,
         )
-        STA_08_SUU79_LA127_1x_Captive_AIM_9M_for_ACM = (
+        STA_08_SUU79_LAU127_1x_Captive_AIM_9M_for_ACM_ = (
             7,
-            WeaponsEA18G.STA_08_SUU79_LA127_1x_Captive_AIM_9M_for_ACM,
+            WeaponsEA18G.STA_08_SUU79_LAU127_1x_Captive_AIM_9M_for_ACM_,
         )
-        STA_08_SUU79_LA127_2x_Captive_AIM_9M_for_ACM = (
+        STA_08_SUU79_LAU127_2x_Captive_AIM_9M_for_ACM_ = (
             7,
-            WeaponsEA18G.STA_08_SUU79_LA127_2x_Captive_AIM_9M_for_ACM,
+            WeaponsEA18G.STA_08_SUU79_LAU127_2x_Captive_AIM_9M_for_ACM_,
         )
-        STA_08_SUU80_LA118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = (
+        STA_08_SUU80_LAU118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = (
             7,
-            WeaponsEA18G.STA_08_SUU80_LA118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile,
+            WeaponsEA18G.STA_08_SUU80_LAU118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile,
         )
-        STA_08_SUU79_BRU32_1x_AGM_154A___JSOW_CEB__CBU_type_ = (
+        STA_08_SUU79_BRU32_1x_AGM_154A___JSOW_CEB__CBU_type__ = (
             7,
-            WeaponsEA18G.STA_08_SUU79_BRU32_1x_AGM_154A___JSOW_CEB__CBU_type_,
+            WeaponsEA18G.STA_08_SUU79_BRU32_1x_AGM_154A___JSOW_CEB__CBU_type__,
         )
-        STA_08_SUU79_BRU55_1x_AGM_154A___JSOW_CEB__CBU_type_ = (
+        STA_08_SUU79_BRU55_1x_AGM_154A___JSOW_CEB__CBU_type__ = (
             7,
-            WeaponsEA18G.STA_08_SUU79_BRU55_1x_AGM_154A___JSOW_CEB__CBU_type_,
+            WeaponsEA18G.STA_08_SUU79_BRU55_1x_AGM_154A___JSOW_CEB__CBU_type__,
         )
-        STA_08_SUU79_BRU55_2x_AGM_154A___JSOW_CEB__CBU_type_ = (
+        STA_08_SUU79_BRU55_2x_AGM_154A___JSOW_CEB__CBU_type__ = (
             7,
-            WeaponsEA18G.STA_08_SUU79_BRU55_2x_AGM_154A___JSOW_CEB__CBU_type_,
+            WeaponsEA18G.STA_08_SUU79_BRU55_2x_AGM_154A___JSOW_CEB__CBU_type__,
         )
-        STA_08_SUU79_BRU32_1x_AGM_154C___JSOW_Unitary_BROACH = (
+        STA_08_SUU79_BRU32_1x_AGM_154C___JSOW_Unitary_BROACH_ = (
             7,
-            WeaponsEA18G.STA_08_SUU79_BRU32_1x_AGM_154C___JSOW_Unitary_BROACH,
+            WeaponsEA18G.STA_08_SUU79_BRU32_1x_AGM_154C___JSOW_Unitary_BROACH_,
         )
-        STA_08_SUU79_BRU55_1x_AGM_154C___JSOW_Unitary_BROACH = (
+        STA_08_SUU79_BRU55_1x_AGM_154C___JSOW_Unitary_BROACH_ = (
             7,
-            WeaponsEA18G.STA_08_SUU79_BRU55_1x_AGM_154C___JSOW_Unitary_BROACH,
+            WeaponsEA18G.STA_08_SUU79_BRU55_1x_AGM_154C___JSOW_Unitary_BROACH_,
         )
-        STA_08_SUU79_BRU55_2x_AGM_154C___JSOW_Unitary_BROACH = (
+        STA_08_SUU79_BRU55_2x_AGM_154C___JSOW_Unitary_BROACH_ = (
             7,
-            WeaponsEA18G.STA_08_SUU79_BRU55_2x_AGM_154C___JSOW_Unitary_BROACH,
+            WeaponsEA18G.STA_08_SUU79_BRU55_2x_AGM_154C___JSOW_Unitary_BROACH_,
         )
-        STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank_ = (
+        STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank__ = (
             7,
-            WeaponsEA18G.STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank_,
+            WeaponsEA18G.STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank__,
         )
-        STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis_ = (
+        STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis__ = (
             7,
-            WeaponsEA18G.STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis_,
+            WeaponsEA18G.STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis__,
+        )
+        STA_08_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = (
+            7,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank,
         )
-
-    # ERRR <CLEAN>
 
     class Pylon8:
-        STA_10_SUU80_LA118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = (
+        STA_10_SUU80_LAU118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_ = (
             8,
-            WeaponsEA18G.STA_10_SUU80_LA118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile,
+            WeaponsEA18G.STA_10_SUU80_LAU118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_,
         )
-        STA_10_SUU80_LA115_1x_AIM_7M_Sparrow_Semi_Active_Radar = (
+        STA_10_SUU80_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar_ = (
             8,
-            WeaponsEA18G.STA_10_SUU80_LA115_1x_AIM_7M_Sparrow_Semi_Active_Radar,
+            WeaponsEA18G.STA_10_SUU80_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar_,
         )
-        STA_10_SUU80_LA127_1x_AIM_9M_Sidewinder_IR_AAM_ = (
+        STA_10_SUU80_LAU115_1x_AIM_7F_Sparrow_Semi_Active_Radar_ = (
             8,
-            WeaponsEA18G.STA_10_SUU80_LA127_1x_AIM_9M_Sidewinder_IR_AAM_,
+            WeaponsEA18G.STA_10_SUU80_LAU115_1x_AIM_7F_Sparrow_Semi_Active_Radar_,
         )
-        STA_10_SUU80_LA127_1x_AIM_9X_Sidewinder_IR_AAM_ = (
+        STA_10_SUU80_LAU115_1x_AIM_7MH_Sparrow_Semi_Active_Radar_ = (
             8,
-            WeaponsEA18G.STA_10_SUU80_LA127_1x_AIM_9X_Sidewinder_IR_AAM_,
+            WeaponsEA18G.STA_10_SUU80_LAU115_1x_AIM_7MH_Sparrow_Semi_Active_Radar_,
         )
-        # ERRR {GROWLER_PYLON_10_OB_Sw_1X_CATM-9M}
-        STA_10_SUU80_LA127_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
+        STA_10_SUU80_LAU115_1x_AIM_7P_Sparrow_Semi_Active_Radar_ = (
             8,
-            WeaponsEA18G.STA_10_SUU80_LA127_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
+            WeaponsEA18G.STA_10_SUU80_LAU115_1x_AIM_7P_Sparrow_Semi_Active_Radar_,
         )
-        STA_10_SUU80_LA127_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
+        STA_10_SUU80_LAU127_1x_AIM_9M_Sidewinder_IR_AAM__ = (
             8,
-            WeaponsEA18G.STA_10_SUU80_LA127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
+            WeaponsEA18G.STA_10_SUU80_LAU127_1x_AIM_9M_Sidewinder_IR_AAM__,
         )
-        STA_10_SUU80_LA127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_10_SUU80_LAU127_1x_AIM_9X_Sidewinder_IR_AAM__ = (
             8,
-            WeaponsEA18G.STA_10_SUU80_LA127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsEA18G.STA_10_SUU80_LAU127_1x_AIM_9X_Sidewinder_IR_AAM__,
         )
-        STA_10_SUU80_LA127_1x_AN_ASQ_T50_V_1_TCTS_Pod = (
+        STA_10_SUU80_LAU127_1x_AIM_120B_AMRAAM___Active_Radar_AAM_ = (
             8,
-            WeaponsEA18G.STA_10_SUU80_LA127_1x_AN_ASQ_T50_V_1_TCTS_Pod,
+            WeaponsEA18G.STA_10_SUU80_LAU127_1x_AIM_120B_AMRAAM___Active_Radar_AAM_,
         )
-        STA_09_SUU79_LA127_1x_AIM_9M_Sidewinder_IR_AAM = (
+        STA_10_SUU80_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM_ = (
             8,
-            WeaponsEA18G.STA_09_SUU79_LA127_1x_AIM_9M_Sidewinder_IR_AAM,
+            WeaponsEA18G.STA_10_SUU80_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM_,
         )
-        STA_09_SUU79_LA127_1x_AIM_9X_Sidewinder_IR_AAM = (
+        STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = (
             8,
-            WeaponsEA18G.STA_09_SUU79_LA127_1x_AIM_9X_Sidewinder_IR_AAM,
+            WeaponsEA18G.STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__,
         )
-        STA_09_SUU79_LA127_2x_AIM_9M_Sidewinder_IR_AAM = (
+        STA_10_SUU80_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod_ = (
             8,
-            WeaponsEA18G.STA_09_SUU79_LA127_2x_AIM_9M_Sidewinder_IR_AAM,
+            WeaponsEA18G.STA_10_SUU80_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod_,
         )
-        STA_09_SUU79_LA127_2x_AIM_9X_Sidewinder_IR_AAM = (
+        STA_09_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM__ = (
             8,
-            WeaponsEA18G.STA_09_SUU79_LA127_2x_AIM_9X_Sidewinder_IR_AAM,
+            WeaponsEA18G.STA_09_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM__,
         )
-        STA_09_SUU79_LA127_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
+        STA_09_SUU79_LAU127_1x_AIM_9X_Sidewinder_IR_AAM__ = (
             8,
-            WeaponsEA18G.STA_09_SUU79_LA127_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
+            WeaponsEA18G.STA_09_SUU79_LAU127_1x_AIM_9X_Sidewinder_IR_AAM__,
         )
-        STA_09_SUU79_LA127_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
+        STA_09_SUU79_LAU127_2x_AIM_9M_Sidewinder_IR_AAM__ = (
             8,
-            WeaponsEA18G.STA_09_SUU79_LA127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
+            WeaponsEA18G.STA_09_SUU79_LAU127_2x_AIM_9M_Sidewinder_IR_AAM__,
         )
-        STA_09_SUU79_LA127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_09_SUU79_LAU127_2x_AIM_9X_Sidewinder_IR_AAM__ = (
             8,
-            WeaponsEA18G.STA_09_SUU79_LA127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsEA18G.STA_09_SUU79_LAU127_2x_AIM_9X_Sidewinder_IR_AAM__,
         )
-        STA_09_SUU79_LA127_2x_AIM_120B_AMRAAM___Active_Radar_AAM = (
+        STA_09_SUU79_LAU127_1x_AIM_120B_AMRAAM___Active_Radar_AAM__ = (
             8,
-            WeaponsEA18G.STA_09_SUU79_LA127_2x_AIM_120B_AMRAAM___Active_Radar_AAM,
+            WeaponsEA18G.STA_09_SUU79_LAU127_1x_AIM_120B_AMRAAM___Active_Radar_AAM__,
         )
-        STA_09_SUU79_LA127_2x_AIM_120C_AMRAAM___Active_Radar_AAM = (
+        STA_09_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM__ = (
             8,
-            WeaponsEA18G.STA_09_SUU79_LA127_2x_AIM_120C_AMRAAM___Active_Radar_AAM,
+            WeaponsEA18G.STA_09_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM__,
         )
-        STA_09_SUU79_LA127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only___ = (
             8,
-            WeaponsEA18G.STA_09_SUU79_LA127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsEA18G.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only___,
         )
-        STA_09_SUU79_LA118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = (
+        STA_09_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM__ = (
             8,
-            WeaponsEA18G.STA_09_SUU79_LA118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile,
+            WeaponsEA18G.STA_09_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM__,
         )
-        STA_09_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = (
+        STA_09_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM__ = (
             8,
-            WeaponsEA18G.STA_09_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank,
+            WeaponsEA18G.STA_09_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM__,
         )
-        STA_10_SUU80_LA127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X_ = (
+        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only___ = (
             8,
-            WeaponsEA18G.STA_10_SUU80_LA127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X_,
+            WeaponsEA18G.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only___,
+        )
+        STA_09_SUU79_LAU118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_ = (
+            8,
+            WeaponsEA18G.STA_09_SUU79_LAU118_1x_AGM_88C_HARM___High_Speed_Anti_Radiation_Missile_,
+        )
+        STA_09_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_ = (
+            8,
+            WeaponsEA18G.STA_09_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_,
+        )
+        STA_10_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X__ = (
+            8,
+            WeaponsEA18G.STA_10_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X__,
         )
-
-    # ERRR <CLEAN>
 
     class Pylon9:
-        STA_10_SUU80_LA127_1x_AIM_9M_Sidewinder_IR_AAM = (
+        STA_10_SUU80_LAU127_1x_AIM_9M_Sidewinder_IR_AAM_ = (
             9,
-            WeaponsEA18G.STA_10_SUU80_LA127_1x_AIM_9M_Sidewinder_IR_AAM,
+            WeaponsEA18G.STA_10_SUU80_LAU127_1x_AIM_9M_Sidewinder_IR_AAM_,
         )
-        STA_10_SUU80_LA127_1x_AIM_9X_Sidewinder_IR_AAM = (
+        STA_10_SUU80_LAU127_1x_AIM_9X_Sidewinder_IR_AAM_ = (
             9,
-            WeaponsEA18G.STA_10_SUU80_LA127_1x_AIM_9X_Sidewinder_IR_AAM,
+            WeaponsEA18G.STA_10_SUU80_LAU127_1x_AIM_9X_Sidewinder_IR_AAM_,
         )
         STA_09_SUU79_BRU32_1x_AN_ALQ_99_ICAP_III_High_Band_Jamming_Pod = (
             9,
@@ -9641,17 +10868,43 @@ class EA_18G(PlaneType):
             9,
             WeaponsEA18G.STA_09_SUU79_BRU32_1x_AN_ALQ_249_Mid_Band_Next_Generation_Jamming_Pod,
         )
-        STA_10_SUU80_LA127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X = (
+        STA_09_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = (
             9,
-            WeaponsEA18G.STA_10_SUU80_LA127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X,
+            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank,
+        )
+        STA_10_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X_ = (
+            9,
+            WeaponsEA18G.STA_10_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X_,
         )
 
-    # ERRR <CLEAN>
-
     class Pylon10:
-        STA_AX_FUEL_CELLS_1x_Internal_Auxillary_Fuel_Cells = (
+        STA_AX_FUEL_CELLS_1x_Internal_Auxillary_Fuel_Cells__570_GAL_ = (
             10,
-            WeaponsFA18EF.STA_AX_FUEL_CELLS_1x_Internal_Auxillary_Fuel_Cells,
+            WeaponsFA18EF.STA_AX_FUEL_CELLS_1x_Internal_Auxillary_Fuel_Cells__570_GAL_,
+        )
+        STA_AX_CKPIT_SMOKE_1x_Internal_Smoke_Generator___White = (
+            10,
+            WeaponsFA18EF.STA_AX_CKPIT_SMOKE_1x_Internal_Smoke_Generator___White,
+        )
+        STA_AX_CKPIT_SMOKE_1x_Internal_Smoke_Generator___Red = (
+            10,
+            WeaponsFA18EF.STA_AX_CKPIT_SMOKE_1x_Internal_Smoke_Generator___Red,
+        )
+        STA_AX_CKPIT_SMOKE_1x_Internal_Smoke_Generator___Green = (
+            10,
+            WeaponsFA18EF.STA_AX_CKPIT_SMOKE_1x_Internal_Smoke_Generator___Green,
+        )
+        STA_AX_CKPIT_SMOKE_1x_Internal_Smoke_Generator___Blue = (
+            10,
+            WeaponsFA18EF.STA_AX_CKPIT_SMOKE_1x_Internal_Smoke_Generator___Blue,
+        )
+        STA_AX_CKPIT_SMOKE_1x_Internal_Smoke_Generator___Yellow = (
+            10,
+            WeaponsFA18EF.STA_AX_CKPIT_SMOKE_1x_Internal_Smoke_Generator___Yellow,
+        )
+        STA_AX_CKPIT_SMOKE_1x_Internal_Smoke_Generator___Orange = (
+            10,
+            WeaponsFA18EF.STA_AX_CKPIT_SMOKE_1x_Internal_Smoke_Generator___Orange,
         )
 
     pylons: Set[int] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}
@@ -9689,6 +10942,7 @@ class FA_18ET(PlaneType):
     flare_charge_size = 1
     tacan = True
     eplrs = True
+    networked_datalink = True
     category = "Tankers"  # {8A302789-A55D-4897-B647-66493FA6826F}
     radio_frequency = 305
 
@@ -9761,10 +11015,19 @@ class FA_18ET(PlaneType):
     }
 
     property_defaults: Dict[str, Any] = {
-        "AIRCRAFT_ID_SEQ": 0,
         "USA_FLAG": False,
-        "BlockIIIEquip": True,
+        "BlockIIIEquip": False,
         "HelmetMountedDevice": 1,
+        "RemoveLOutboard": True,
+        "RemoveLMidboard": True,
+        "RemoveLInboard": True,
+        "RemoveCenter": True,
+        "RemoveRInboard": True,
+        "RemoveRMidboard": True,
+        "RemoveROutboard": True,
+        "VoiceCallsignLabel": None,
+        "VoiceCallsignNumber": None,
+        "STN_L16": None,
         "DYNAMIC_BORTS_MODE": 0,
         "DYNAMIC_BUNOS": False,
         "DYNAMIC_BUNO_01": 10,
@@ -9777,18 +11040,6 @@ class FA_18ET(PlaneType):
 
     class Properties:
 
-        class AIRCRAFT_ID_SEQ:
-            id = "AIRCRAFT_ID_SEQ"
-
-            class Values:
-                Norm = 0
-                Pattern_0A = 1
-                Pattern_1B = 2
-                Pattern_2C = 3
-                Pattern_3D = 4
-                Pattern_4E = 5
-                Pattern_5F = 6
-
         class USA_FLAG:
             id = "USA_FLAG"
 
@@ -9803,6 +11054,36 @@ class FA_18ET(PlaneType):
                 JHMCS = 1
                 NVG = 2
 
+        class RemoveLOutboard:
+            id = "RemoveLOutboard"
+
+        class RemoveLMidboard:
+            id = "RemoveLMidboard"
+
+        class RemoveLInboard:
+            id = "RemoveLInboard"
+
+        class RemoveCenter:
+            id = "RemoveCenter"
+
+        class RemoveRInboard:
+            id = "RemoveRInboard"
+
+        class RemoveRMidboard:
+            id = "RemoveRMidboard"
+
+        class RemoveROutboard:
+            id = "RemoveROutboard"
+
+        class VoiceCallsignLabel:
+            id = "VoiceCallsignLabel"
+
+        class VoiceCallsignNumber:
+            id = "VoiceCallsignNumber"
+
+        class STN_L16:
+            id = "STN_L16"
+
         class DYNAMIC_BORTS_MODE:
             id = "DYNAMIC_BORTS_MODE"
 
@@ -9914,29 +11195,24 @@ class FA_18ET(PlaneType):
                 Blank = 10
 
     properties = {
+        "EQUIPMENT_Label": UnitPropertyDescription(
+            identifier="EQUIPMENT_Label",
+            control="label",
+            label="Aircraft / Pilot Equipment Settings",
+            player_only=False,
+            x_lbl=100,
+        ),
         "USA_FLAG": UnitPropertyDescription(
             identifier="USA_FLAG",
-            control="comboList",
+            control="checkbox",
             label="Hood Displayed USA Flag",
-            player_only=False,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            default=False,
         ),
         "BlockIIIEquip": UnitPropertyDescription(
             identifier="BlockIIIEquip",
-            control="comboList",
+            control="checkbox",
             label="Block III Antennas (Cosmetic)",
-            player_only=False,
-            default=1,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            default=False,
         ),
         "HelmetMountedDevice": UnitPropertyDescription(
             identifier="HelmetMountedDevice",
@@ -9951,12 +11227,61 @@ class FA_18ET(PlaneType):
                 2: "NVG",
             },
         ),
+        "RemoveLOutboard": UnitPropertyDescription(
+            identifier="RemoveLOutboard",
+            control="checkbox",
+            label="Mount STA 2 SUU-80A Pylon",
+            default=True,
+            weight_when_on=55.79,
+        ),
+        "RemoveLMidboard": UnitPropertyDescription(
+            identifier="RemoveLMidboard",
+            control="checkbox",
+            label="Mount STA 3 SUU-79A Pylon",
+            default=True,
+            weight_when_on=163.29,
+        ),
+        "RemoveLInboard": UnitPropertyDescription(
+            identifier="RemoveLInboard",
+            control="checkbox",
+            label="Mount STA 4 SUU-79A Pylon",
+            default=True,
+            weight_when_on=163.29,
+        ),
+        "RemoveCenter": UnitPropertyDescription(
+            identifier="RemoveCenter",
+            control="checkbox",
+            label="Mount STA 6 SUU-78A Pylon",
+            default=True,
+            weight_when_on=83,
+        ),
+        "RemoveRInboard": UnitPropertyDescription(
+            identifier="RemoveRInboard",
+            control="checkbox",
+            label="Mount STA 8 SUU-79A Pylon",
+            default=True,
+            weight_when_on=163.29,
+        ),
+        "RemoveRMidboard": UnitPropertyDescription(
+            identifier="RemoveRMidboard",
+            control="checkbox",
+            label="Mount STA 9 SUU-79A Pylon",
+            default=True,
+            weight_when_on=163.29,
+        ),
+        "RemoveROutboard": UnitPropertyDescription(
+            identifier="RemoveROutboard",
+            control="checkbox",
+            label="Mount STA 10 SUU-80A Pylon",
+            default=True,
+            weight_when_on=55.79,
+        ),
         "datalink_Label": UnitPropertyDescription(
             identifier="datalink_Label",
             control="label",
-            label="DATALINK",
+            label="Datalink Settings",
             player_only=False,
-            x_lbl=150,
+            x_lbl=100,
         ),
         "VoiceCallsignLabel": UnitPropertyDescription(
             identifier="VoiceCallsignLabel",
@@ -9976,6 +11301,161 @@ class FA_18ET(PlaneType):
             label="STN",
             player_only=False,
         ),
+        "DYNAMIC_BORTS": UnitPropertyDescription(
+            identifier="DYNAMIC_BORTS",
+            control="label",
+            label="Aircraft Identification Stencils",
+            player_only=False,
+            x_lbl=100,
+        ),
+        "DYNAMIC_BORTS_MODE": UnitPropertyDescription(
+            identifier="DYNAMIC_BORTS_MODE",
+            control="comboList",
+            label="Aircraft Identification Type",
+            player_only=False,
+            default=0,
+            w_ctrl=150,
+            values={
+                0: "DISABLED / NONE",
+                1: "USN STANDARD",
+                2: "RAAF FIGHTER",
+                3: "RAAF GROWLER",
+                4: "KAF LEGACY",
+                5: "KAF SUPER HORNET",
+            },
+        ),
+        "DYNAMIC_BUNOS": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNOS",
+            control="checkbox",
+            label="Aircraft Identification BUNO",
+            default=False,
+        ),
+        "DYNAMIC_BUNO_01": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_01",
+            control="comboList",
+            label="Aircraft BUNO Digit #1",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_02": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_02",
+            control="comboList",
+            label="Aircraft BUNO Digit #2",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_03": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_03",
+            control="comboList",
+            label="Aircraft BUNO Digit #3",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_04": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_04",
+            control="comboList",
+            label="Aircraft BUNO Digit #4",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_05": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_05",
+            control="comboList",
+            label="Aircraft BUNO Digit #5",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_06": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_06",
+            control="comboList",
+            label="Aircraft BUNO Digit #6",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
     }
 
     livery_name = "FA-18E"  # from livery_entry
@@ -9997,6 +11477,10 @@ class FA_18ET(PlaneType):
             1,
             WeaponsFA18EF.STA_01_WNGTP_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod,
         )
+        STA_01_WNGTP_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            1,
+            WeaponsFA18EF.STA_01_WNGTP_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
 
     class Pylon2:
         STA_02_SUU80_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar = (
@@ -10027,9 +11511,9 @@ class FA_18ET(PlaneType):
             2,
             WeaponsFA18EF.STA_02_SUU80_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             2,
-            WeaponsFA18EF.STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_02_SUU80_LAU117_1x_AGM_65E___Maverick_E__Laser_ASM___Lg_Whd_ = (
             2,
@@ -10123,9 +11607,9 @@ class FA_18ET(PlaneType):
             2,
             WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             2,
-            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_03_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             2,
@@ -10135,9 +11619,9 @@ class FA_18ET(PlaneType):
             2,
             WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             2,
-            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_03_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM = (
             2,
@@ -10247,7 +11731,6 @@ class FA_18ET(PlaneType):
             2,
             WeaponsFA18EF.STA_03_SUU79_BRU32_1x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
-        # ERRR {SUPERHORNET_PYLON_02_MB_MK_BR55_1X_GBU-38}
         STA_03_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             2,
             WeaponsFA18EF.STA_03_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
@@ -10272,89 +11755,115 @@ class FA_18ET(PlaneType):
             2,
             WeaponsFA18EF.STA_03_SUU79_BRU33_2x_GBU_12___500lb_Laser_Guided_Bomb,
         )
-        STA_02_03_79_80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM = (
+        STA_02_03_79___80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM = (
             2,
-            WeaponsFA18EF.STA_02_03_79_80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM,
         )
-        STA_02_03_79_80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM = (
+        STA_02_03_79___80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM = (
             2,
-            WeaponsFA18EF.STA_02_03_79_80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM,
         )
-        STA_02_03_79_80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
+        STA_02_03_79___80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             2,
-            WeaponsFA18EF.STA_02_03_79_80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
         )
-        STA_02_03_79_80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
+        STA_02_03_79___80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
             2,
-            WeaponsFA18EF.STA_02_03_79_80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_02_03_79_80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_02_03_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             2,
-            WeaponsFA18EF.STA_02_03_79_80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
-        STA_03_02_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
+        STA_03_02_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
         )
-        STA_03_02_79_80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb = (
+        STA_03_02_79___80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb,
         )
-        STA_03_02_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
+        STA_03_02_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
         )
-        STA_03_02_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
+        STA_03_02_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
         )
-        STA_03_02_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+        STA_03_02_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
         )
-        STA_03_02_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
+        STA_03_02_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        STA_03_02_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
+        STA_03_02_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
-        STA_04_02_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
+        STA_04_02_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
             2,
-            WeaponsFA18EF.STA_04_02_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
+            WeaponsFA18EF.STA_04_02_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
         )
-        STA_04_02_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
+        STA_04_02_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             2,
-            WeaponsFA18EF.STA_04_02_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
+            WeaponsFA18EF.STA_04_02_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
         )
-        # ERRR {SUPERHORNET_PYLON_02_MB_MK_BR55_1X_GBU-32V}
-        # ERRR {SUPERHORNET_PYLON_02_MB_MK_BR55_2X_GBU-32V}
-        STA_04_02_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
+        STA_04_02_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
             2,
-            WeaponsFA18EF.STA_04_02_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_04_02_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
         )
-        STA_04_02_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+        STA_04_02_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
             2,
-            WeaponsFA18EF.STA_04_02_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
+            WeaponsFA18EF.STA_04_02_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
         )
-        STA_04_02_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
+        STA_04_02_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
             2,
-            WeaponsFA18EF.STA_04_02_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_04_02_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        STA_04_02_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
+        STA_04_02_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             2,
-            WeaponsFA18EF.STA_04_02_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
+            WeaponsFA18EF.STA_04_02_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
         STA_02_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X = (
             2,
             WeaponsFA18EF.STA_02_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X,
         )
         STA_02_SUU80_EMPTY = (2, WeaponsFA18EF.STA_02_SUU80_EMPTY)
-        # ERRR <CLEAN>
-        # ERRR {CATM-120C}
-        # ERRR {CATM-9M}
-        # ERRR {CATM-9X}
+        STA_02_SUU80_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_02_SUU80_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_03_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_03_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_02_03_79___80_LAU127_1x_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_02_03_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
         LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar = (
             2,
             Weapons.LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar,
@@ -10395,10 +11904,6 @@ class FA_18ET(PlaneType):
         )
 
     class Pylon3:
-        STA_02_SUU79_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod = (
-            3,
-            WeaponsFA18EF.STA_02_SUU79_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod,
-        )
         STA_03_SUU79_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar_ = (
             3,
             WeaponsFA18EF.STA_03_SUU79_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar_,
@@ -10411,9 +11916,9 @@ class FA_18ET(PlaneType):
             3,
             WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM_,
         )
-        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__ = (
+        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = (
             3,
-            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__,
         )
         STA_03_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM_ = (
             3,
@@ -10423,9 +11928,9 @@ class FA_18ET(PlaneType):
             3,
             WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM_,
         )
-        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__ = (
+        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = (
             3,
-            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__,
         )
         STA_03_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM_ = (
             3,
@@ -10451,13 +11956,13 @@ class FA_18ET(PlaneType):
             3,
             WeaponsFA18EF.STA_03_SUU79_LAU127_2x_Captive_AIM_9M_for_ACM_,
         )
-        STA_03_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = (
+        STA_03_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = (
             3,
-            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank,
+            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank,
         )
-        STA_03_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = (
+        STA_03_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = (
             3,
-            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis,
+            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis,
         )
         STA_03_SUU79_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod = (
             3,
@@ -10563,7 +12068,6 @@ class FA_18ET(PlaneType):
             3,
             WeaponsFA18EF.STA_03_SUU79_BRU32_1x_GBU_38___JDAM__500lb_GPS_Guided_Bomb_,
         )
-        # ERRR {SUPERHORNET_PYLON_03_MB_MK_1X_GBU-32V}
         STA_03_SUU79_BRU32_1x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets_ = (
             3,
             WeaponsFA18EF.STA_03_SUU79_BRU32_1x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets_,
@@ -10604,7 +12108,6 @@ class FA_18ET(PlaneType):
             3,
             WeaponsFA18EF.STA_03_SUU79_BRU33_2x_Mk_83___1000lb_GP_Bomb_LD_,
         )
-        # ERRR {SUPERHORNET_PYLON_03_MB_MK_BR2_ROCKEYE}
         STA_03_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb_ = (
             3,
             WeaponsFA18EF.STA_03_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb_,
@@ -10661,9 +12164,9 @@ class FA_18ET(PlaneType):
             3,
             WeaponsFA18EF.STA_04_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             3,
-            WeaponsFA18EF.STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_04_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             3,
@@ -10673,19 +12176,18 @@ class FA_18ET(PlaneType):
             3,
             WeaponsFA18EF.STA_04_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             3,
-            WeaponsFA18EF.STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
-        STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = (
+        STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = (
             3,
-            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank,
         )
-        STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = (
+        STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = (
             3,
-            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis,
         )
-        # ERRR {SUPERHORNET_PYLON_03_IB_PD_1X_ALQ-167}
         STA_04_SUU79_BRU32_1x_AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_ = (
             3,
             WeaponsFA18EF.STA_04_SUU79_BRU32_1x_AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_,
@@ -10710,6 +12212,10 @@ class FA_18ET(PlaneType):
             3,
             WeaponsFA18EF.STA_04_SUU79_LAU117_1x_CATM_65K___Captive_Trg_Round_for_Mav_K__CCD___AI_Only,
         )
+        STA_04_SUU79_BRU32_1x_AGM_154C___JSOW_Unitary_BROACH = (
+            3,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_AGM_154C___JSOW_Unitary_BROACH,
+        )
         STA_04_SUU79_BRU55_1x_AGM_154C___JSOW_Unitary_BROACH = (
             3,
             WeaponsFA18EF.STA_04_SUU79_BRU55_1x_AGM_154C___JSOW_Unitary_BROACH,
@@ -10786,7 +12292,6 @@ class FA_18ET(PlaneType):
             3,
             WeaponsFA18EF.STA_04_SUU79_BRU33_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        # ERRR {SUPERHORNET_PYLON_03_IB_MK_BR2_ROCKEYE}
         STA_04_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             3,
             WeaponsFA18EF.STA_04_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
@@ -10795,9 +12300,9 @@ class FA_18ET(PlaneType):
             3,
             WeaponsFA18EF.STA_04_SUU79_BRU55_2x_GBU_32_V_2_B___JDAM__1000lb_GPS_Guided_Bomb,
         )
-        STA_04_03_79_80_BRU32_1x_1x_AGM_154C___JSOW_Unitary_BROACH = (
+        STA_04_03_79___80_BRU32_1x_1x_AGM_154C___JSOW_Unitary_BROACH = (
             3,
-            WeaponsFA18EF.STA_04_03_79_80_BRU32_1x_1x_AGM_154C___JSOW_Unitary_BROACH,
+            WeaponsFA18EF.STA_04_03_79___80_BRU32_1x_1x_AGM_154C___JSOW_Unitary_BROACH,
         )
         STA_04_03_SUU79_BRU32_1x_1x_GBU_10___2000lb_Laser_Guided_Bomb = (
             3,
@@ -10848,10 +12353,62 @@ class FA_18ET(PlaneType):
             WeaponsFA18EF.STA_04_03_SUU79_BRU32_1x_1x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
         STA_03_SUU79_EMPTY = (3, WeaponsFA18EF.STA_03_SUU79_EMPTY)
-        # ERRR <CLEAN>
-        # ERRR LAU-115_2*LAU-127_CATM-120C
-        # ERRR LAU_117_TGM_65E
-        # ERRR LAU_117_TGM_65F
+        STA_03_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__ = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__,
+        )
+        STA_03_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__ = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__,
+        )
+        STA_04_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            3,
+            WeaponsFA18EF.STA_04_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_04_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            3,
+            WeaponsFA18EF.STA_04_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__ = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__,
+        )
+        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__ = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__,
+        )
+        STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            3,
+            WeaponsFA18EF.STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            3,
+            WeaponsFA18EF.STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_03_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_ = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_,
+        )
+        STA_03_04_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_ = (
+            3,
+            WeaponsFA18EF.STA_03_04_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_,
+        )
+        STA_03_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_ = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_,
+        )
+        STA_03_04_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_ = (
+            3,
+            WeaponsFA18EF.STA_03_04_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_,
+        )
+        STA_03_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank,
+        )
+        STA_04_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = (
+            3,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank,
+        )
         LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar = (
             3,
             Weapons.LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar,
@@ -10923,9 +12480,9 @@ class FA_18ET(PlaneType):
             4,
             WeaponsFA18EF.STA_05_CHEEK__LAU116_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             4,
-            WeaponsFA18EF.STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_05_CHEEK__LAU116_1x_AIM_7M_Sparrow_Semi_Active_Radar = (
             4,
@@ -10947,28 +12504,31 @@ class FA_18ET(PlaneType):
             4,
             WeaponsFA18EF.STA_05_CHEEK__TGPMNT_1x_AN_ASQ_228_ATFLIR___Targeting_Pod,
         )
-        STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank_ = (
+        STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_ = (
             4,
-            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank_,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_,
         )
-        STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis_ = (
+        STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis_ = (
             4,
-            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis_,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis_,
         )
         AWW_13_DATALINK_POD = (4, Weapons.AWW_13_DATALINK_POD)
-        STA_04_SUU79_BRU32_Remove_SUU_79A_A_Pylon = (
+        STA_05_CHEEK__TGPMNT_Empty_Weapon_Replacable_Assembly__WRA__Adapter = (
             4,
-            WeaponsFA18EF.STA_04_SUU79_BRU32_Remove_SUU_79A_A_Pylon,
-        )
-        STA_05_CHEEK__TGPMNT_Empty_TGP_Mount = (
-            4,
-            WeaponsFA18EF.STA_05_CHEEK__TGPMNT_Empty_TGP_Mount,
+            WeaponsFA18EF.STA_05_CHEEK__TGPMNT_Empty_Weapon_Replacable_Assembly__WRA__Adapter,
         )
         STA_05_CHEEK__LAU116_Empty_AIM_7_120_Ejectors = (
             4,
             WeaponsFA18EF.STA_05_CHEEK__LAU116_Empty_AIM_7_120_Ejectors,
         )
-        # ERRR <CLEAN>
+        STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            4,
+            WeaponsFA18EF.STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_04_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank_ = (
+            4,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank_,
+        )
         AIM_7F_Sparrow_Semi_Active_Radar = (4, Weapons.AIM_7F_Sparrow_Semi_Active_Radar)
         AIM_7MH_Sparrow_Semi_Active_Radar = (
             4,
@@ -10981,28 +12541,35 @@ class FA_18ET(PlaneType):
         )
 
     class Pylon5:
-        STA_06_SUU78_BRU32_1x_FPU_12_A_Fuel_Tank = (
+        STA_06_SUU78_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = (
             5,
-            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_12_A_Fuel_Tank,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank,
         )
-        STA_06_SUU78_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = (
+        STA_06_SUU78_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = (
             5,
-            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis,
         )
-        STA_06_SUU78_BRU32_1x_A_A_42R_1_Aerial_Refueling_Buddy_Pod = (
+        STA_06_SUU78_BRU32_1x_A_A_42R_1__300_GAL__Aerial_Refueling_Buddy_Pod__FUEL_ONLY_ = (
             5,
-            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_A_A_42R_1_Aerial_Refueling_Buddy_Pod,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_A_A_42R_1__300_GAL__Aerial_Refueling_Buddy_Pod__FUEL_ONLY_,
         )
         STA_06_SUU78_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod = (
             5,
             WeaponsFA18EF.STA_06_SUU78_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod,
         )
-        STA_06_SUU78_BRU32_1x_AN_AAQ_28_LITENING___Targeting_Pod = (
+        STA_06_SUU78_BRU32_1x_AN_AAQ_28_LITENING_Targeting_Pod = (
             5,
-            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_AN_AAQ_28_LITENING___Targeting_Pod,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_AN_AAQ_28_LITENING_Targeting_Pod,
+        )
+        STA_06_SUU78_BRU32_1x_FPU_13_A__340_GAL__with_ASG_34A_V_1_Infrared_Search_and_Track_System___FUEL_ONLY__ = (
+            5,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_13_A__340_GAL__with_ASG_34A_V_1_Infrared_Search_and_Track_System___FUEL_ONLY__,
         )
         STA_06_SUU78_EMPTY = (5, WeaponsFA18EF.STA_06_SUU78_EMPTY)
-        # ERRR <CLEAN>
+        STA_06_SUU78_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = (
+            5,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank,
+        )
         AWW_13_DATALINK_POD = (5, Weapons.AWW_13_DATALINK_POD)
         AN_AAQ_28_LITENING___Targeting_Pod_ = (
             5,
@@ -11018,9 +12585,9 @@ class FA_18ET(PlaneType):
             6,
             WeaponsFA18EF.STA_07_CHEEK__LAU116_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             6,
-            WeaponsFA18EF.STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_07_CHEEK__LAU116_1x_AIM_7M_Sparrow_Semi_Active_Radar = (
             6,
@@ -11038,28 +12605,27 @@ class FA_18ET(PlaneType):
             6,
             WeaponsFA18EF.STA_07_CHEEK__LAU116_1x_AIM_7P_Sparrow_Semi_Active_Radar,
         )
-        STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = (
+        STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = (
             6,
-            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank,
         )
-        STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = (
+        STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = (
             6,
-            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis,
         )
         STA_08_SUU79_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod = (
             6,
             WeaponsFA18EF.STA_08_SUU79_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod,
         )
-        STA_07_SUU79_BRU32_Remove_SUU_79A_A_Pylon = (
-            6,
-            WeaponsFA18EF.STA_07_SUU79_BRU32_Remove_SUU_79A_A_Pylon,
-        )
         STA_08_SUU79_EMPTY = (6, WeaponsFA18EF.STA_08_SUU79_EMPTY)
-        STA_08_SUU79_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X = (
+        STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
             6,
-            WeaponsFA18EF.STA_08_SUU79_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X,
+            WeaponsFA18EF.STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_08_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = (
+            6,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank,
         )
-        # ERRR <CLEAN>
         AIM_7F_Sparrow_Semi_Active_Radar = (6, Weapons.AIM_7F_Sparrow_Semi_Active_Radar)
         AIM_7MH_Sparrow_Semi_Active_Radar = (
             6,
@@ -11069,10 +12635,6 @@ class FA_18ET(PlaneType):
         AWW_13_DATALINK_POD = (6, Weapons.AWW_13_DATALINK_POD)
 
     class Pylon7:
-        STA_09_SUU79_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod = (
-            7,
-            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod,
-        )
         STA_09_SUU79_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar = (
             7,
             WeaponsFA18EF.STA_09_SUU79_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar,
@@ -11085,9 +12647,9 @@ class FA_18ET(PlaneType):
             7,
             WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             7,
-            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_09_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             7,
@@ -11097,9 +12659,9 @@ class FA_18ET(PlaneType):
             7,
             WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             7,
-            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_09_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM = (
             7,
@@ -11125,13 +12687,13 @@ class FA_18ET(PlaneType):
             7,
             WeaponsFA18EF.STA_09_SUU79_LAU127_2x_Captive_AIM_9M_for_ACM,
         )
-        STA_09_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = (
+        STA_09_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = (
             7,
-            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank,
+            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank,
         )
-        STA_09_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = (
+        STA_09_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = (
             7,
-            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis,
+            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis,
         )
         STA_09_SUU79_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod = (
             7,
@@ -11281,7 +12843,6 @@ class FA_18ET(PlaneType):
             7,
             WeaponsFA18EF.STA_09_SUU79_BRU33_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        # ERRR {SUPERHORNET_PYLON_09_MB_MK_BR2_ROCKEYE}
         STA_09_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             7,
             WeaponsFA18EF.STA_09_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
@@ -11338,9 +12899,9 @@ class FA_18ET(PlaneType):
             7,
             WeaponsFA18EF.STA_08_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             7,
-            WeaponsFA18EF.STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_08_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             7,
@@ -11350,20 +12911,18 @@ class FA_18ET(PlaneType):
             7,
             WeaponsFA18EF.STA_08_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             7,
-            WeaponsFA18EF.STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
-        STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank_ = (
+        STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_ = (
             7,
-            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank_,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_,
         )
-        STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis_ = (
+        STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis_ = (
             7,
-            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis_,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis_,
         )
-        # ERRR {SUPERHORNET_PYLON_09_IB_PD_1X_ALQ-167}
-        # ERRR {SUPERHORNET_PYLON_09_IB_PD_1X_ALQ-167}
         STA_08_SUU79_BRU32_1x_AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_ = (
             7,
             WeaponsFA18EF.STA_08_SUU79_BRU32_1x_AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_,
@@ -11376,11 +12935,15 @@ class FA_18ET(PlaneType):
             7,
             WeaponsFA18EF.STA_08_SUU79_LAU117_1x_CATM_65K___Captive_Trg_Round_for_Mav_K__CCD___AI_Only,
         )
-        STA_08_SUU79_BRU55_2x_AGM_154C___JSOW_Unitary_BROACH = (
+        STA_08_SUU79_BRU32_1x_AGM_154C___JSOW_Unitary_BROACH = (
             7,
-            WeaponsFA18EF.STA_08_SUU79_BRU55_2x_AGM_154C___JSOW_Unitary_BROACH,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_AGM_154C___JSOW_Unitary_BROACH,
         )
-        STA_08_SUU79_BRU55_2x_AGM_154C___JSOW_Unitary_BROACH_ = (
+        STA_08_SUU79_BRU55_1x_AGM_154C___JSOW_Unitary_BROACH = (
+            7,
+            WeaponsFA18EF.STA_08_SUU79_BRU55_1x_AGM_154C___JSOW_Unitary_BROACH,
+        )
+        STA_08_SUU79_BRU55_2x_AGM_154C___JSOW_Unitary_BROACH = (
             7,
             WeaponsFA18EF.STA_08_SUU79_BRU55_2x_AGM_154C___JSOW_Unitary_BROACH,
         )
@@ -11464,7 +13027,6 @@ class FA_18ET(PlaneType):
             7,
             WeaponsFA18EF.STA_08_SUU79_BRU33_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        # ERRR {SUPERHORNET_PYLON_09_IB_MK_BR2_ROCKEYE}
         STA_08_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             7,
             WeaponsFA18EF.STA_08_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
@@ -11526,10 +13088,62 @@ class FA_18ET(PlaneType):
             WeaponsFA18EF.STA_09_08_SUU79_BRU32_1x_1x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
         STA_09_SUU79_EMPTY = (7, WeaponsFA18EF.STA_09_SUU79_EMPTY)
-        # ERRR <CLEAN>
-        # ERRR LAU-115_2*LAU-127_CATM-120C
-        # ERRR LAU_117_TGM_65E
-        # ERRR LAU_117_TGM_65F
+        STA_09_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_09_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_08_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_08_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_08_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_08_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_09_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_,
+        )
+        STA_09_08_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_09_08_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_,
+        )
+        STA_09_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_ = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_,
+        )
+        STA_09_08_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_ = (
+            7,
+            WeaponsFA18EF.STA_09_08_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_,
+        )
+        STA_09_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank,
+        )
+        STA_08_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank_ = (
+            7,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank_,
+        )
         LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar = (
             7,
             Weapons.LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar,
@@ -11617,9 +13231,9 @@ class FA_18ET(PlaneType):
             8,
             WeaponsFA18EF.STA_10_SUU80_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             8,
-            WeaponsFA18EF.STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_10_SUU80_LAU117_1x_AGM_65E___Maverick_E__Laser_ASM___Lg_Whd_ = (
             8,
@@ -11713,9 +13327,9 @@ class FA_18ET(PlaneType):
             8,
             WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM_,
         )
-        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__ = (
+        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = (
             8,
-            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__,
         )
         STA_09_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM_ = (
             8,
@@ -11725,9 +13339,9 @@ class FA_18ET(PlaneType):
             8,
             WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM_,
         )
-        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__ = (
+        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = (
             8,
-            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__,
         )
         STA_09_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM_ = (
             8,
@@ -11861,87 +13475,115 @@ class FA_18ET(PlaneType):
             8,
             WeaponsFA18EF.STA_09_SUU79_BRU33_2x_GBU_12___500lb_Laser_Guided_Bomb_,
         )
-        STA_09_10_79_80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM = (
+        STA_09_10_79___80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM,
         )
-        STA_09_10_79_80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM = (
+        STA_09_10_79___80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM,
         )
-        STA_09_10_79_80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
+        STA_09_10_79___80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
         )
-        STA_09_10_79_80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
+        STA_09_10_79___80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_09_10_79_80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_09_10_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
-        STA_09_10_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
+        STA_09_10_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
         )
-        STA_09_10_79_80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb = (
+        STA_09_10_79___80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb,
         )
-        STA_09_10_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
+        STA_09_10_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
         )
-        STA_09_10_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
+        STA_09_10_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
         )
-        STA_09_10_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+        STA_09_10_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
         )
-        STA_09_10_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
+        STA_09_10_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        STA_09_10_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
+        STA_09_10_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
-        STA_10_08_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
+        STA_10_08_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
             8,
-            WeaponsFA18EF.STA_10_08_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
+            WeaponsFA18EF.STA_10_08_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
         )
-        STA_10_08_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
+        STA_10_08_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             8,
-            WeaponsFA18EF.STA_10_08_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
+            WeaponsFA18EF.STA_10_08_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
         )
-        STA_10_08_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
+        STA_10_08_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
             8,
-            WeaponsFA18EF.STA_10_08_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_10_08_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
         )
-        STA_10_08_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+        STA_10_08_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
             8,
-            WeaponsFA18EF.STA_10_08_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
+            WeaponsFA18EF.STA_10_08_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
         )
-        STA_10_08_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
+        STA_10_08_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
             8,
-            WeaponsFA18EF.STA_10_08_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_10_08_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        STA_10_08_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
+        STA_10_08_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             8,
-            WeaponsFA18EF.STA_10_08_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
+            WeaponsFA18EF.STA_10_08_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
         STA_10_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X = (
             8,
             WeaponsFA18EF.STA_10_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X,
         )
         STA_10_SUU80_EMPTY = (8, WeaponsFA18EF.STA_10_SUU80_EMPTY)
-        # ERRR <CLEAN>
-        # ERRR {CATM-120C}
-        # ERRR {CATM-9M}
-        # ERRR {CATM-9X}
+        STA_10_SUU80_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            8,
+            WeaponsFA18EF.STA_10_SUU80_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_09_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__ = (
+            8,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__,
+        )
+        STA_09_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__ = (
+            8,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__,
+        )
+        STA_09_10_79___80_LAU127_1x_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            8,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            8,
+            WeaponsFA18EF.STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__ = (
+            8,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__,
+        )
+        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__ = (
+            8,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__,
+        )
+        STA_09_10_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            8,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
         LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar = (
             8,
             Weapons.LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar,
@@ -11998,11 +13640,15 @@ class FA_18ET(PlaneType):
             9,
             WeaponsFA18EF.STA_11_WNGTP_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod,
         )
+        STA_11_WNGTP_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            9,
+            WeaponsFA18EF.STA_11_WNGTP_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
 
     class Pylon10:
-        STA_AX_FUEL_CELLS_1x_Internal_Auxillary_Fuel_Cells = (
+        STA_AX_FUEL_CELLS_1x_Internal_Auxillary_Fuel_Cells__570_GAL_ = (
             10,
-            WeaponsFA18EF.STA_AX_FUEL_CELLS_1x_Internal_Auxillary_Fuel_Cells,
+            WeaponsFA18EF.STA_AX_FUEL_CELLS_1x_Internal_Auxillary_Fuel_Cells__570_GAL_,
         )
         STA_AX_CKPIT_SMOKE_1x_Internal_Smoke_Generator___White = (
             10,
@@ -12051,6 +13697,7 @@ class FA_18FT(PlaneType):
     flare_charge_size = 1
     tacan = True
     eplrs = True
+    networked_datalink = True
     category = "Tankers"  # {8A302789-A55D-4897-B647-66493FA6826F}
     radio_frequency = 305
 
@@ -12123,10 +13770,21 @@ class FA_18FT(PlaneType):
     }
 
     property_defaults: Dict[str, Any] = {
-        "AIRCRAFT_ID_SEQ": 0,
+        "SoloFlight": False,
         "USA_FLAG": False,
-        "BlockIIIEquip": True,
+        "BlockIIIEquip": False,
         "HelmetMountedDevice": 1,
+        "HelmetMountedDeviceWSO": 1,
+        "RemoveLOutboard": True,
+        "RemoveLMidboard": True,
+        "RemoveLInboard": True,
+        "RemoveCenter": True,
+        "RemoveRInboard": True,
+        "RemoveRMidboard": True,
+        "RemoveROutboard": True,
+        "VoiceCallsignLabel": None,
+        "VoiceCallsignNumber": None,
+        "STN_L16": None,
         "DYNAMIC_BORTS_MODE": 0,
         "DYNAMIC_BUNOS": False,
         "DYNAMIC_BUNO_01": 10,
@@ -12139,17 +13797,8 @@ class FA_18FT(PlaneType):
 
     class Properties:
 
-        class AIRCRAFT_ID_SEQ:
-            id = "AIRCRAFT_ID_SEQ"
-
-            class Values:
-                Norm = 0
-                Pattern_0A = 1
-                Pattern_1B = 2
-                Pattern_2C = 3
-                Pattern_3D = 4
-                Pattern_4E = 5
-                Pattern_5F = 6
+        class SoloFlight:
+            id = "SoloFlight"
 
         class USA_FLAG:
             id = "USA_FLAG"
@@ -12165,6 +13814,44 @@ class FA_18FT(PlaneType):
                 JHMCS = 1
                 NVG = 2
 
+        class HelmetMountedDeviceWSO:
+            id = "HelmetMountedDeviceWSO"
+
+            class Values:
+                Not_installed = 0
+                JHMCS = 1
+                NVG = 2
+
+        class RemoveLOutboard:
+            id = "RemoveLOutboard"
+
+        class RemoveLMidboard:
+            id = "RemoveLMidboard"
+
+        class RemoveLInboard:
+            id = "RemoveLInboard"
+
+        class RemoveCenter:
+            id = "RemoveCenter"
+
+        class RemoveRInboard:
+            id = "RemoveRInboard"
+
+        class RemoveRMidboard:
+            id = "RemoveRMidboard"
+
+        class RemoveROutboard:
+            id = "RemoveROutboard"
+
+        class VoiceCallsignLabel:
+            id = "VoiceCallsignLabel"
+
+        class VoiceCallsignNumber:
+            id = "VoiceCallsignNumber"
+
+        class STN_L16:
+            id = "STN_L16"
+
         class DYNAMIC_BORTS_MODE:
             id = "DYNAMIC_BORTS_MODE"
 
@@ -12276,34 +13963,44 @@ class FA_18FT(PlaneType):
                 Blank = 10
 
     properties = {
+        "WSO_Label": UnitPropertyDescription(
+            identifier="WSO_Label",
+            control="label",
+            label="Aircraft Crew Settings",
+            player_only=False,
+            x_lbl=150,
+        ),
+        "SoloFlight": UnitPropertyDescription(
+            identifier="SoloFlight",
+            control="checkbox",
+            label="Solo Flight",
+            player_only=False,
+            default=False,
+            weight_when_on=-80,
+        ),
+        "EQUIPMENT_Label": UnitPropertyDescription(
+            identifier="EQUIPMENT_Label",
+            control="label",
+            label="Aircraft / Pilot Equipment Settings",
+            player_only=False,
+            x_lbl=100,
+        ),
         "USA_FLAG": UnitPropertyDescription(
             identifier="USA_FLAG",
-            control="comboList",
+            control="checkbox",
             label="Hood Displayed USA Flag",
-            player_only=False,
-            default=0,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            default=False,
         ),
         "BlockIIIEquip": UnitPropertyDescription(
             identifier="BlockIIIEquip",
-            control="comboList",
+            control="checkbox",
             label="Block III Antennas (Cosmetic)",
-            player_only=False,
-            default=1,
-            w_ctrl=150,
-            values={
-                0: "False",
-                1: "True",
-            },
+            default=False,
         ),
         "HelmetMountedDevice": UnitPropertyDescription(
             identifier="HelmetMountedDevice",
             control="comboList",
-            label="Helmet Mounted Device",
+            label="Pilot Helmet Mounted Device",
             player_only=True,
             default=1,
             w_ctrl=150,
@@ -12313,12 +14010,74 @@ class FA_18FT(PlaneType):
                 2: "NVG",
             },
         ),
+        "HelmetMountedDeviceWSO": UnitPropertyDescription(
+            identifier="HelmetMountedDeviceWSO",
+            control="comboList",
+            label="WSO Helmet Mounted Device",
+            player_only=True,
+            default=1,
+            w_ctrl=150,
+            values={
+                0: "Not installed",
+                1: "JHMCS",
+                2: "NVG",
+            },
+        ),
+        "RemoveLOutboard": UnitPropertyDescription(
+            identifier="RemoveLOutboard",
+            control="checkbox",
+            label="Mount STA 2 SUU-80A Pylon",
+            default=True,
+            weight_when_on=55.79,
+        ),
+        "RemoveLMidboard": UnitPropertyDescription(
+            identifier="RemoveLMidboard",
+            control="checkbox",
+            label="Mount STA 3 SUU-79A Pylon",
+            default=True,
+            weight_when_on=163.29,
+        ),
+        "RemoveLInboard": UnitPropertyDescription(
+            identifier="RemoveLInboard",
+            control="checkbox",
+            label="Mount STA 4 SUU-79A Pylon",
+            default=True,
+            weight_when_on=163.29,
+        ),
+        "RemoveCenter": UnitPropertyDescription(
+            identifier="RemoveCenter",
+            control="checkbox",
+            label="Mount STA 6 SUU-78A Pylon",
+            default=True,
+            weight_when_on=83,
+        ),
+        "RemoveRInboard": UnitPropertyDescription(
+            identifier="RemoveRInboard",
+            control="checkbox",
+            label="Mount STA 8 SUU-79A Pylon",
+            default=True,
+            weight_when_on=163.29,
+        ),
+        "RemoveRMidboard": UnitPropertyDescription(
+            identifier="RemoveRMidboard",
+            control="checkbox",
+            label="Mount STA 9 SUU-79A Pylon",
+            default=True,
+            weight_when_on=163.29,
+        ),
+        "RemoveROutboard": UnitPropertyDescription(
+            identifier="RemoveROutboard",
+            control="checkbox",
+            label="Mount STA 10 SUU-80A Pylon",
+            default=True,
+            weight_when_on=55.79,
+        ),
         "datalink_Label": UnitPropertyDescription(
             identifier="datalink_Label",
             control="label",
-            label="DATALINK",
+            label="Datalink Settings",
             player_only=False,
-            x_lbl=150,
+            x_lbl=100,
         ),
         "VoiceCallsignLabel": UnitPropertyDescription(
             identifier="VoiceCallsignLabel",
@@ -12338,6 +14097,161 @@ class FA_18FT(PlaneType):
             label="STN",
             player_only=False,
         ),
+        "DYNAMIC_BORTS": UnitPropertyDescription(
+            identifier="DYNAMIC_BORTS",
+            control="label",
+            label="Aircraft Identification Stencils",
+            player_only=False,
+            x_lbl=100,
+        ),
+        "DYNAMIC_BORTS_MODE": UnitPropertyDescription(
+            identifier="DYNAMIC_BORTS_MODE",
+            control="comboList",
+            label="Aircraft Identification Type",
+            player_only=False,
+            default=0,
+            w_ctrl=150,
+            values={
+                0: "DISABLED / NONE",
+                1: "USN STANDARD",
+                2: "RAAF FIGHTER",
+                3: "RAAF GROWLER",
+                4: "KAF LEGACY",
+                5: "KAF SUPER HORNET",
+            },
+        ),
+        "DYNAMIC_BUNOS": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNOS",
+            control="checkbox",
+            label="Aircraft Identification BUNO",
+            default=False,
+        ),
+        "DYNAMIC_BUNO_01": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_01",
+            control="comboList",
+            label="Aircraft BUNO Digit #1",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_02": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_02",
+            control="comboList",
+            label="Aircraft BUNO Digit #2",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_03": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_03",
+            control="comboList",
+            label="Aircraft BUNO Digit #3",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_04": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_04",
+            control="comboList",
+            label="Aircraft BUNO Digit #4",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_05": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_05",
+            control="comboList",
+            label="Aircraft BUNO Digit #5",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
+        "DYNAMIC_BUNO_06": UnitPropertyDescription(
+            identifier="DYNAMIC_BUNO_06",
+            control="comboList",
+            label="Aircraft BUNO Digit #6",
+            player_only=False,
+            default=10,
+            w_ctrl=60,
+            values={
+                0: "1",
+                1: "2",
+                2: "3",
+                3: "4",
+                4: "5",
+                5: "6",
+                6: "7",
+                7: "8",
+                8: "9",
+                9: "0",
+                10: "Blank",
+            },
+        ),
     }
 
     livery_name = "FA-18F"  # from livery_entry
@@ -12359,6 +14273,10 @@ class FA_18FT(PlaneType):
             1,
             WeaponsFA18EF.STA_01_WNGTP_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod,
         )
+        STA_01_WNGTP_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            1,
+            WeaponsFA18EF.STA_01_WNGTP_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
 
     class Pylon2:
         STA_02_SUU80_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar = (
@@ -12389,9 +14307,9 @@ class FA_18FT(PlaneType):
             2,
             WeaponsFA18EF.STA_02_SUU80_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             2,
-            WeaponsFA18EF.STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_02_SUU80_LAU117_1x_AGM_65E___Maverick_E__Laser_ASM___Lg_Whd_ = (
             2,
@@ -12485,9 +14403,9 @@ class FA_18FT(PlaneType):
             2,
             WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             2,
-            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_03_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             2,
@@ -12497,9 +14415,9 @@ class FA_18FT(PlaneType):
             2,
             WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             2,
-            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_03_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM = (
             2,
@@ -12609,7 +14527,6 @@ class FA_18FT(PlaneType):
             2,
             WeaponsFA18EF.STA_03_SUU79_BRU32_1x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
-        # ERRR {SUPERHORNET_PYLON_02_MB_MK_BR55_1X_GBU-38}
         STA_03_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             2,
             WeaponsFA18EF.STA_03_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
@@ -12634,89 +14551,115 @@ class FA_18FT(PlaneType):
             2,
             WeaponsFA18EF.STA_03_SUU79_BRU33_2x_GBU_12___500lb_Laser_Guided_Bomb,
         )
-        STA_02_03_79_80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM = (
+        STA_02_03_79___80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM = (
             2,
-            WeaponsFA18EF.STA_02_03_79_80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM,
         )
-        STA_02_03_79_80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM = (
+        STA_02_03_79___80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM = (
             2,
-            WeaponsFA18EF.STA_02_03_79_80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM,
         )
-        STA_02_03_79_80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
+        STA_02_03_79___80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             2,
-            WeaponsFA18EF.STA_02_03_79_80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
         )
-        STA_02_03_79_80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
+        STA_02_03_79___80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
             2,
-            WeaponsFA18EF.STA_02_03_79_80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_02_03_79_80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_02_03_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             2,
-            WeaponsFA18EF.STA_02_03_79_80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
-        STA_03_02_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
+        STA_03_02_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
         )
-        STA_03_02_79_80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb = (
+        STA_03_02_79___80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb,
         )
-        STA_03_02_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
+        STA_03_02_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
         )
-        STA_03_02_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
+        STA_03_02_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
         )
-        STA_03_02_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+        STA_03_02_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
         )
-        STA_03_02_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
+        STA_03_02_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        STA_03_02_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
+        STA_03_02_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             2,
-            WeaponsFA18EF.STA_03_02_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
+            WeaponsFA18EF.STA_03_02_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
-        STA_04_02_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
+        STA_04_02_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
             2,
-            WeaponsFA18EF.STA_04_02_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
+            WeaponsFA18EF.STA_04_02_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
         )
-        STA_04_02_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
+        STA_04_02_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             2,
-            WeaponsFA18EF.STA_04_02_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
+            WeaponsFA18EF.STA_04_02_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
         )
-        # ERRR {SUPERHORNET_PYLON_02_MB_MK_BR55_1X_GBU-32V}
-        # ERRR {SUPERHORNET_PYLON_02_MB_MK_BR55_2X_GBU-32V}
-        STA_04_02_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
+        STA_04_02_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
             2,
-            WeaponsFA18EF.STA_04_02_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_04_02_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
         )
-        STA_04_02_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+        STA_04_02_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
             2,
-            WeaponsFA18EF.STA_04_02_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
+            WeaponsFA18EF.STA_04_02_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
         )
-        STA_04_02_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
+        STA_04_02_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
             2,
-            WeaponsFA18EF.STA_04_02_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_04_02_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        STA_04_02_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
+        STA_04_02_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             2,
-            WeaponsFA18EF.STA_04_02_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
+            WeaponsFA18EF.STA_04_02_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
         STA_02_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X = (
             2,
             WeaponsFA18EF.STA_02_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X,
         )
         STA_02_SUU80_EMPTY = (2, WeaponsFA18EF.STA_02_SUU80_EMPTY)
-        # ERRR <CLEAN>
-        # ERRR {CATM-120C}
-        # ERRR {CATM-9M}
-        # ERRR {CATM-9X}
+        STA_02_SUU80_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_02_SUU80_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_03_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_03_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_02_03_79___80_LAU127_1x_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_02_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_02_03_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            2,
+            WeaponsFA18EF.STA_02_03_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
         LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar = (
             2,
             Weapons.LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar,
@@ -12757,10 +14700,6 @@ class FA_18FT(PlaneType):
         )
 
     class Pylon3:
-        STA_02_SUU79_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod = (
-            3,
-            WeaponsFA18EF.STA_02_SUU79_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod,
-        )
         STA_03_SUU79_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar_ = (
             3,
             WeaponsFA18EF.STA_03_SUU79_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar_,
@@ -12773,9 +14712,9 @@ class FA_18FT(PlaneType):
             3,
             WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM_,
         )
-        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__ = (
+        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = (
             3,
-            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__,
         )
         STA_03_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM_ = (
             3,
@@ -12785,9 +14724,9 @@ class FA_18FT(PlaneType):
             3,
             WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM_,
         )
-        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__ = (
+        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = (
             3,
-            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__,
         )
         STA_03_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM_ = (
             3,
@@ -12813,13 +14752,13 @@ class FA_18FT(PlaneType):
             3,
             WeaponsFA18EF.STA_03_SUU79_LAU127_2x_Captive_AIM_9M_for_ACM_,
         )
-        STA_03_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = (
+        STA_03_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = (
             3,
-            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank,
+            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank,
         )
-        STA_03_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = (
+        STA_03_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = (
             3,
-            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis,
+            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis,
         )
         STA_03_SUU79_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod = (
             3,
@@ -12925,7 +14864,6 @@ class FA_18FT(PlaneType):
             3,
             WeaponsFA18EF.STA_03_SUU79_BRU32_1x_GBU_38___JDAM__500lb_GPS_Guided_Bomb_,
         )
-        # ERRR {SUPERHORNET_PYLON_03_MB_MK_1X_GBU-32V}
         STA_03_SUU79_BRU32_1x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets_ = (
             3,
             WeaponsFA18EF.STA_03_SUU79_BRU32_1x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets_,
@@ -12966,7 +14904,6 @@ class FA_18FT(PlaneType):
             3,
             WeaponsFA18EF.STA_03_SUU79_BRU33_2x_Mk_83___1000lb_GP_Bomb_LD_,
         )
-        # ERRR {SUPERHORNET_PYLON_03_MB_MK_BR2_ROCKEYE}
         STA_03_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb_ = (
             3,
             WeaponsFA18EF.STA_03_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb_,
@@ -13023,9 +14960,9 @@ class FA_18FT(PlaneType):
             3,
             WeaponsFA18EF.STA_04_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             3,
-            WeaponsFA18EF.STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_04_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             3,
@@ -13035,19 +14972,18 @@ class FA_18FT(PlaneType):
             3,
             WeaponsFA18EF.STA_04_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             3,
-            WeaponsFA18EF.STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
-        STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = (
+        STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = (
             3,
-            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank,
         )
-        STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = (
+        STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = (
             3,
-            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis,
         )
-        # ERRR {SUPERHORNET_PYLON_03_IB_PD_1X_ALQ-167}
         STA_04_SUU79_BRU32_1x_AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_ = (
             3,
             WeaponsFA18EF.STA_04_SUU79_BRU32_1x_AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_,
@@ -13072,6 +15008,10 @@ class FA_18FT(PlaneType):
             3,
             WeaponsFA18EF.STA_04_SUU79_LAU117_1x_CATM_65K___Captive_Trg_Round_for_Mav_K__CCD___AI_Only,
         )
+        STA_04_SUU79_BRU32_1x_AGM_154C___JSOW_Unitary_BROACH = (
+            3,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_AGM_154C___JSOW_Unitary_BROACH,
+        )
         STA_04_SUU79_BRU55_1x_AGM_154C___JSOW_Unitary_BROACH = (
             3,
             WeaponsFA18EF.STA_04_SUU79_BRU55_1x_AGM_154C___JSOW_Unitary_BROACH,
@@ -13148,7 +15088,6 @@ class FA_18FT(PlaneType):
             3,
             WeaponsFA18EF.STA_04_SUU79_BRU33_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        # ERRR {SUPERHORNET_PYLON_03_IB_MK_BR2_ROCKEYE}
         STA_04_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             3,
             WeaponsFA18EF.STA_04_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
@@ -13157,9 +15096,9 @@ class FA_18FT(PlaneType):
             3,
             WeaponsFA18EF.STA_04_SUU79_BRU55_2x_GBU_32_V_2_B___JDAM__1000lb_GPS_Guided_Bomb,
         )
-        STA_04_03_79_80_BRU32_1x_1x_AGM_154C___JSOW_Unitary_BROACH = (
+        STA_04_03_79___80_BRU32_1x_1x_AGM_154C___JSOW_Unitary_BROACH = (
             3,
-            WeaponsFA18EF.STA_04_03_79_80_BRU32_1x_1x_AGM_154C___JSOW_Unitary_BROACH,
+            WeaponsFA18EF.STA_04_03_79___80_BRU32_1x_1x_AGM_154C___JSOW_Unitary_BROACH,
         )
         STA_04_03_SUU79_BRU32_1x_1x_GBU_10___2000lb_Laser_Guided_Bomb = (
             3,
@@ -13210,10 +15149,62 @@ class FA_18FT(PlaneType):
             WeaponsFA18EF.STA_04_03_SUU79_BRU32_1x_1x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
         STA_03_SUU79_EMPTY = (3, WeaponsFA18EF.STA_03_SUU79_EMPTY)
-        # ERRR <CLEAN>
-        # ERRR LAU-115_2*LAU-127_CATM-120C
-        # ERRR LAU_117_TGM_65E
-        # ERRR LAU_117_TGM_65F
+        STA_03_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__ = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__,
+        )
+        STA_03_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__ = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__,
+        )
+        STA_04_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            3,
+            WeaponsFA18EF.STA_04_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_04_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            3,
+            WeaponsFA18EF.STA_04_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__ = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__,
+        )
+        STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__ = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__,
+        )
+        STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            3,
+            WeaponsFA18EF.STA_04_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            3,
+            WeaponsFA18EF.STA_04_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_03_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_ = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_,
+        )
+        STA_03_04_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_ = (
+            3,
+            WeaponsFA18EF.STA_03_04_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_,
+        )
+        STA_03_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_ = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_,
+        )
+        STA_03_04_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_ = (
+            3,
+            WeaponsFA18EF.STA_03_04_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_,
+        )
+        STA_03_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = (
+            3,
+            WeaponsFA18EF.STA_03_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank,
+        )
+        STA_04_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = (
+            3,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank,
+        )
         LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar = (
             3,
             Weapons.LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar,
@@ -13285,9 +15276,9 @@ class FA_18FT(PlaneType):
             4,
             WeaponsFA18EF.STA_05_CHEEK__LAU116_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             4,
-            WeaponsFA18EF.STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_05_CHEEK__LAU116_1x_AIM_7M_Sparrow_Semi_Active_Radar = (
             4,
@@ -13309,28 +15300,31 @@ class FA_18FT(PlaneType):
             4,
             WeaponsFA18EF.STA_05_CHEEK__TGPMNT_1x_AN_ASQ_228_ATFLIR___Targeting_Pod,
         )
-        STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank_ = (
+        STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_ = (
             4,
-            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank_,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_,
         )
-        STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis_ = (
+        STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis_ = (
             4,
-            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis_,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis_,
         )
         AWW_13_DATALINK_POD = (4, Weapons.AWW_13_DATALINK_POD)
-        STA_04_SUU79_BRU32_Remove_SUU_79A_A_Pylon = (
+        STA_05_CHEEK__TGPMNT_Empty_Weapon_Replacable_Assembly__WRA__Adapter = (
             4,
-            WeaponsFA18EF.STA_04_SUU79_BRU32_Remove_SUU_79A_A_Pylon,
-        )
-        STA_05_CHEEK__TGPMNT_Empty_TGP_Mount = (
-            4,
-            WeaponsFA18EF.STA_05_CHEEK__TGPMNT_Empty_TGP_Mount,
+            WeaponsFA18EF.STA_05_CHEEK__TGPMNT_Empty_Weapon_Replacable_Assembly__WRA__Adapter,
         )
         STA_05_CHEEK__LAU116_Empty_AIM_7_120_Ejectors = (
             4,
             WeaponsFA18EF.STA_05_CHEEK__LAU116_Empty_AIM_7_120_Ejectors,
         )
-        # ERRR <CLEAN>
+        STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            4,
+            WeaponsFA18EF.STA_05_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_04_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank_ = (
+            4,
+            WeaponsFA18EF.STA_04_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank_,
+        )
         AIM_7F_Sparrow_Semi_Active_Radar = (4, Weapons.AIM_7F_Sparrow_Semi_Active_Radar)
         AIM_7MH_Sparrow_Semi_Active_Radar = (
             4,
@@ -13343,28 +15337,35 @@ class FA_18FT(PlaneType):
         )
 
     class Pylon5:
-        STA_06_SUU78_BRU32_1x_FPU_12_A_Fuel_Tank = (
+        STA_06_SUU78_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = (
             5,
-            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_12_A_Fuel_Tank,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank,
         )
-        STA_06_SUU78_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = (
+        STA_06_SUU78_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = (
             5,
-            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis,
         )
-        STA_06_SUU78_BRU32_1x_A_A_42R_1_Aerial_Refueling_Buddy_Pod = (
+        STA_06_SUU78_BRU32_1x_A_A_42R_1__300_GAL__Aerial_Refueling_Buddy_Pod__FUEL_ONLY_ = (
             5,
-            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_A_A_42R_1_Aerial_Refueling_Buddy_Pod,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_A_A_42R_1__300_GAL__Aerial_Refueling_Buddy_Pod__FUEL_ONLY_,
         )
         STA_06_SUU78_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod = (
             5,
             WeaponsFA18EF.STA_06_SUU78_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod,
         )
-        STA_06_SUU78_BRU32_1x_AN_AAQ_28_LITENING___Targeting_Pod = (
+        STA_06_SUU78_BRU32_1x_AN_AAQ_28_LITENING_Targeting_Pod = (
             5,
-            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_AN_AAQ_28_LITENING___Targeting_Pod,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_AN_AAQ_28_LITENING_Targeting_Pod,
+        )
+        STA_06_SUU78_BRU32_1x_FPU_13_A__340_GAL__with_ASG_34A_V_1_Infrared_Search_and_Track_System___FUEL_ONLY__ = (
+            5,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_13_A__340_GAL__with_ASG_34A_V_1_Infrared_Search_and_Track_System___FUEL_ONLY__,
         )
         STA_06_SUU78_EMPTY = (5, WeaponsFA18EF.STA_06_SUU78_EMPTY)
-        # ERRR <CLEAN>
+        STA_06_SUU78_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = (
+            5,
+            WeaponsFA18EF.STA_06_SUU78_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank,
+        )
         AWW_13_DATALINK_POD = (5, Weapons.AWW_13_DATALINK_POD)
         AN_AAQ_28_LITENING___Targeting_Pod_ = (
             5,
@@ -13380,9 +15381,9 @@ class FA_18FT(PlaneType):
             6,
             WeaponsFA18EF.STA_07_CHEEK__LAU116_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             6,
-            WeaponsFA18EF.STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_07_CHEEK__LAU116_1x_AIM_7M_Sparrow_Semi_Active_Radar = (
             6,
@@ -13400,28 +15401,27 @@ class FA_18FT(PlaneType):
             6,
             WeaponsFA18EF.STA_07_CHEEK__LAU116_1x_AIM_7P_Sparrow_Semi_Active_Radar,
         )
-        STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = (
+        STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = (
             6,
-            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank,
         )
-        STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = (
+        STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = (
             6,
-            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis,
         )
         STA_08_SUU79_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod = (
             6,
             WeaponsFA18EF.STA_08_SUU79_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod,
         )
-        STA_07_SUU79_BRU32_Remove_SUU_79A_A_Pylon = (
-            6,
-            WeaponsFA18EF.STA_07_SUU79_BRU32_Remove_SUU_79A_A_Pylon,
-        )
         STA_08_SUU79_EMPTY = (6, WeaponsFA18EF.STA_08_SUU79_EMPTY)
-        STA_08_SUU79_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X = (
+        STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
             6,
-            WeaponsFA18EF.STA_08_SUU79_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X,
+            WeaponsFA18EF.STA_07_CHEEK__LAU116_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_08_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = (
+            6,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank,
         )
-        # ERRR <CLEAN>
         AIM_7F_Sparrow_Semi_Active_Radar = (6, Weapons.AIM_7F_Sparrow_Semi_Active_Radar)
         AIM_7MH_Sparrow_Semi_Active_Radar = (
             6,
@@ -13431,10 +15431,6 @@ class FA_18FT(PlaneType):
         AWW_13_DATALINK_POD = (6, Weapons.AWW_13_DATALINK_POD)
 
     class Pylon7:
-        STA_09_SUU79_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod = (
-            7,
-            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod,
-        )
         STA_09_SUU79_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar = (
             7,
             WeaponsFA18EF.STA_09_SUU79_LAU115_1x_AIM_7M_Sparrow_Semi_Active_Radar,
@@ -13447,9 +15443,9 @@ class FA_18FT(PlaneType):
             7,
             WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             7,
-            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_09_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             7,
@@ -13459,9 +15455,9 @@ class FA_18FT(PlaneType):
             7,
             WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             7,
-            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_09_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM = (
             7,
@@ -13487,13 +15483,13 @@ class FA_18FT(PlaneType):
             7,
             WeaponsFA18EF.STA_09_SUU79_LAU127_2x_Captive_AIM_9M_for_ACM,
         )
-        STA_09_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank = (
+        STA_09_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank = (
             7,
-            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank,
+            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank,
         )
-        STA_09_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis = (
+        STA_09_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis = (
             7,
-            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis,
+            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis,
         )
         STA_09_SUU79_BRU32_1x_AN_AWW_13_Advanced_Datalink_Pod = (
             7,
@@ -13643,7 +15639,6 @@ class FA_18FT(PlaneType):
             7,
             WeaponsFA18EF.STA_09_SUU79_BRU33_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        # ERRR {SUPERHORNET_PYLON_09_MB_MK_BR2_ROCKEYE}
         STA_09_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             7,
             WeaponsFA18EF.STA_09_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
@@ -13700,9 +15695,9 @@ class FA_18FT(PlaneType):
             7,
             WeaponsFA18EF.STA_08_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             7,
-            WeaponsFA18EF.STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_08_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             7,
@@ -13712,20 +15707,18 @@ class FA_18FT(PlaneType):
             7,
             WeaponsFA18EF.STA_08_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             7,
-            WeaponsFA18EF.STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
-        STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank_ = (
+        STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_ = (
             7,
-            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank_,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank_,
         )
-        STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis_ = (
+        STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis_ = (
             7,
-            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A_Fuel_Tank___High_Vis_,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_12_A__480_GAL__Fuel_Tank___High_Vis_,
         )
-        # ERRR {SUPERHORNET_PYLON_09_IB_PD_1X_ALQ-167}
-        # ERRR {SUPERHORNET_PYLON_09_IB_PD_1X_ALQ-167}
         STA_08_SUU79_BRU32_1x_AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_ = (
             7,
             WeaponsFA18EF.STA_08_SUU79_BRU32_1x_AGM_84E_Harpoon_SLAM__Stand_Off_Land_Attack_Missile_,
@@ -13738,11 +15731,15 @@ class FA_18FT(PlaneType):
             7,
             WeaponsFA18EF.STA_08_SUU79_LAU117_1x_CATM_65K___Captive_Trg_Round_for_Mav_K__CCD___AI_Only,
         )
-        STA_08_SUU79_BRU55_2x_AGM_154C___JSOW_Unitary_BROACH = (
+        STA_08_SUU79_BRU32_1x_AGM_154C___JSOW_Unitary_BROACH = (
             7,
-            WeaponsFA18EF.STA_08_SUU79_BRU55_2x_AGM_154C___JSOW_Unitary_BROACH,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_AGM_154C___JSOW_Unitary_BROACH,
         )
-        STA_08_SUU79_BRU55_2x_AGM_154C___JSOW_Unitary_BROACH_ = (
+        STA_08_SUU79_BRU55_1x_AGM_154C___JSOW_Unitary_BROACH = (
+            7,
+            WeaponsFA18EF.STA_08_SUU79_BRU55_1x_AGM_154C___JSOW_Unitary_BROACH,
+        )
+        STA_08_SUU79_BRU55_2x_AGM_154C___JSOW_Unitary_BROACH = (
             7,
             WeaponsFA18EF.STA_08_SUU79_BRU55_2x_AGM_154C___JSOW_Unitary_BROACH,
         )
@@ -13826,7 +15823,6 @@ class FA_18FT(PlaneType):
             7,
             WeaponsFA18EF.STA_08_SUU79_BRU33_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        # ERRR {SUPERHORNET_PYLON_09_IB_MK_BR2_ROCKEYE}
         STA_08_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             7,
             WeaponsFA18EF.STA_08_SUU79_BRU55_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
@@ -13888,10 +15884,62 @@ class FA_18FT(PlaneType):
             WeaponsFA18EF.STA_09_08_SUU79_BRU32_1x_1x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
         STA_09_SUU79_EMPTY = (7, WeaponsFA18EF.STA_09_SUU79_EMPTY)
-        # ERRR <CLEAN>
-        # ERRR LAU-115_2*LAU-127_CATM-120C
-        # ERRR LAU_117_TGM_65E
-        # ERRR LAU_117_TGM_65F
+        STA_09_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_09_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_08_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_08_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_08_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_08_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_08_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_08_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_09_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_,
+        )
+        STA_09_08_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_ = (
+            7,
+            WeaponsFA18EF.STA_09_08_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___Current_Hill_s_AIM_174B_Mod_Required_,
+        )
+        STA_09_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_ = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_,
+        )
+        STA_09_08_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_ = (
+            7,
+            WeaponsFA18EF.STA_09_08_SUU79_BRU32_2x_AIM_174B_Gunslinger___Active_Radar_AAM___AI_Only_,
+        )
+        STA_09_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank = (
+            7,
+            WeaponsFA18EF.STA_09_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank,
+        )
+        STA_08_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank_ = (
+            7,
+            WeaponsFA18EF.STA_08_SUU79_BRU32_1x_FPU_8_A__330_GAL__Fuel_Tank_,
+        )
         LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar = (
             7,
             Weapons.LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar,
@@ -13979,9 +16027,9 @@ class FA_18FT(PlaneType):
             8,
             WeaponsFA18EF.STA_10_SUU80_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             8,
-            WeaponsFA18EF.STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
         STA_10_SUU80_LAU117_1x_AGM_65E___Maverick_E__Laser_ASM___Lg_Whd_ = (
             8,
@@ -14075,9 +16123,9 @@ class FA_18FT(PlaneType):
             8,
             WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120C_AMRAAM___Active_Radar_AAM_,
         )
-        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__ = (
+        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = (
             8,
-            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__,
         )
         STA_09_SUU79_LAU127_2x_AIM_120B_AMRAAM___Active_Radar_AAM_ = (
             8,
@@ -14087,9 +16135,9 @@ class FA_18FT(PlaneType):
             8,
             WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120C_AMRAAM___Active_Radar_AAM_,
         )
-        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__ = (
+        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__ = (
             8,
-            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only__,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only__,
         )
         STA_09_SUU79_LAU127_1x_AIM_9M_Sidewinder_IR_AAM_ = (
             8,
@@ -14223,87 +16271,115 @@ class FA_18FT(PlaneType):
             8,
             WeaponsFA18EF.STA_09_SUU79_BRU33_2x_GBU_12___500lb_Laser_Guided_Bomb_,
         )
-        STA_09_10_79_80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM = (
+        STA_09_10_79___80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_9M_Sidewinder_IR_AAM,
         )
-        STA_09_10_79_80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM = (
+        STA_09_10_79___80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_9X_Sidewinder_IR_AAM,
         )
-        STA_09_10_79_80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
+        STA_09_10_79___80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_120B_AMRAAM___Active_Radar_AAM,
         )
-        STA_09_10_79_80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
+        STA_09_10_79___80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_120C_AMRAAM___Active_Radar_AAM,
         )
-        STA_09_10_79_80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_ = (
+        STA_09_10_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_ = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__AI_Only_,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM___AI_Only_,
         )
-        STA_09_10_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
+        STA_09_10_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
         )
-        STA_09_10_79_80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb = (
+        STA_09_10_79___80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_GBU_16___1000lb_Laser_Guided_Bomb,
         )
-        STA_09_10_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
+        STA_09_10_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
         )
-        STA_09_10_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
+        STA_09_10_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
         )
-        STA_09_10_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+        STA_09_10_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
         )
-        STA_09_10_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
+        STA_09_10_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        STA_09_10_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
+        STA_09_10_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             8,
-            WeaponsFA18EF.STA_09_10_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
+            WeaponsFA18EF.STA_09_10_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
-        STA_10_08_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
+        STA_10_08_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb = (
             8,
-            WeaponsFA18EF.STA_10_08_79_80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
+            WeaponsFA18EF.STA_10_08_79___80_BRU32_2x_GBU_12___500lb_Laser_Guided_Bomb,
         )
-        STA_10_08_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
+        STA_10_08_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb = (
             8,
-            WeaponsFA18EF.STA_10_08_79_80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
+            WeaponsFA18EF.STA_10_08_79___80_BRU32_2x_GBU_38___JDAM__500lb_GPS_Guided_Bomb,
         )
-        STA_10_08_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
+        STA_10_08_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD = (
             8,
-            WeaponsFA18EF.STA_10_08_79_80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_10_08_79___80_BRU32_2x_Mk_82___500lb_GP_Bomb_LD,
         )
-        STA_10_08_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
+        STA_10_08_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
             8,
-            WeaponsFA18EF.STA_10_08_79_80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
+            WeaponsFA18EF.STA_10_08_79___80_BRU32_2x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
         )
-        STA_10_08_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
+        STA_10_08_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD = (
             8,
-            WeaponsFA18EF.STA_10_08_79_80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
+            WeaponsFA18EF.STA_10_08_79___80_BRU32_2x_Mk_83___1000lb_GP_Bomb_LD,
         )
-        STA_10_08_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
+        STA_10_08_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             8,
-            WeaponsFA18EF.STA_10_08_79_80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
+            WeaponsFA18EF.STA_10_08_79___80_BRU32_2x_Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
         )
         STA_10_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X = (
             8,
             WeaponsFA18EF.STA_10_SUU80_LAU127_1x_Marvin_LAU_127_Rail_Launcher_for_AIM_120B_C_D_and_AIM9L_M_X,
         )
         STA_10_SUU80_EMPTY = (8, WeaponsFA18EF.STA_10_SUU80_EMPTY)
-        # ERRR <CLEAN>
-        # ERRR {CATM-120C}
-        # ERRR {CATM-9M}
-        # ERRR {CATM-9X}
+        STA_10_SUU80_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            8,
+            WeaponsFA18EF.STA_10_SUU80_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_09_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__ = (
+            8,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__,
+        )
+        STA_09_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__ = (
+            8,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required__,
+        )
+        STA_09_10_79___80_LAU127_1x_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            8,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
+        STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            8,
+            WeaponsFA18EF.STA_10_SUU80_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
+        STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__ = (
+            8,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__,
+        )
+        STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__ = (
+            8,
+            WeaponsFA18EF.STA_09_SUU79_LAU127_2x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required__,
+        )
+        STA_09_10_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_ = (
+            8,
+            WeaponsFA18EF.STA_09_10_79___80_LAU127_1x_1x_AIM_120D_AMRAAM___Active_Radar_AAM__Modern_Missiles_Mod_Required_,
+        )
         LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar = (
             8,
             Weapons.LAU_115C_with_AIM_7F_Sparrow_Semi_Active_Radar,
@@ -14360,11 +16436,15 @@ class FA_18FT(PlaneType):
             9,
             WeaponsFA18EF.STA_11_WNGTP_LAU127_1x_AN_ASQ_T50_V_1_TCTS_Pod,
         )
+        STA_11_WNGTP_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_ = (
+            9,
+            WeaponsFA18EF.STA_11_WNGTP_LAU127_1x_AIM_9X_2_Sidewinder_IR_AAM___Modern_Missiles_Mod_Required_,
+        )
 
     class Pylon10:
-        STA_AX_FUEL_CELLS_1x_Internal_Auxillary_Fuel_Cells = (
+        STA_AX_FUEL_CELLS_1x_Internal_Auxillary_Fuel_Cells__570_GAL_ = (
             10,
-            WeaponsFA18EF.STA_AX_FUEL_CELLS_1x_Internal_Auxillary_Fuel_Cells,
+            WeaponsFA18EF.STA_AX_FUEL_CELLS_1x_Internal_Auxillary_Fuel_Cells__570_GAL_,
         )
         STA_AX_CKPIT_SMOKE_1x_Internal_Smoke_Generator___White = (
             10,
diff --git a/qt_ui/windows/newgame/WizardPages/QGeneratorSettings.py b/qt_ui/windows/newgame/WizardPages/QGeneratorSettings.py
index 04a79149..8095b71f 100644
--- a/qt_ui/windows/newgame/WizardPages/QGeneratorSettings.py
+++ b/qt_ui/windows/newgame/WizardPages/QGeneratorSettings.py
@@ -226,8 +226,8 @@ class GeneratorOptions(QtWidgets.QWizardPage):
             ("F-4B/C Phantom II (2.8.7.204)", self.f4bc_phantom),
             ("F-84G Thunderjet (v2.5.7.01)", self.f84g_thunderjet),
             ("F9F Panther (v2.8.7.101)", self.f9f_panther),
-            ("F/A-18E/F/G Super Hornet (version 2.4.2)", self.fa_18efg),
-            ("F/A-18E/F Super Hornet AI Tanker (version 2.4.2)", self.fa18ef_tanker),
+            ("F/A-18E/F/G Super Hornet (version 2.4.4)", self.fa_18efg),
+            ("F/A-18E/F Super Hornet AI Tanker (version 2.4.4)", self.fa18ef_tanker),
             ("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/resources/customized_payloads/EA-18G.lua b/resources/customized_payloads/EA-18G.lua
index 729f898a..0903dbdd 100644
--- a/resources/customized_payloads/EA-18G.lua
+++ b/resources/customized_payloads/EA-18G.lua
@@ -37,7 +37,7 @@ local unitPayloads = {
 				},
 				[7]=
 				{
-					["CLSID"]="{GROWLER_PYLON_04_IB_FT_FPU-12_Fueltank}",
+					["CLSID"]="{GROWLER_PYLON_08_IB_FT_FPU-12_Fueltank}",
 					["num"]=7
 				},
 				[8]=
@@ -97,7 +97,7 @@ local unitPayloads = {
 				},
 				[7]=
 				{
-					["CLSID"]="{GROWLER_PYLON_04_IB_FT_FPU-12_Fueltank}",
+					["CLSID"]="{GROWLER_PYLON_08_IB_FT_FPU-12_Fueltank}",
 					["num"]=7
 				},
 				[8]=
@@ -157,7 +157,7 @@ local unitPayloads = {
 				},
 				[7]=
 				{
-					["CLSID"]="{GROWLER_PYLON_04_IB_FT_FPU-12_Fueltank}",
+					["CLSID"]="{GROWLER_PYLON_08_IB_FT_FPU-12_Fueltank}",
 					["num"]=7
 				},
 				[8]=
@@ -217,7 +217,7 @@ local unitPayloads = {
 				},
 				[7]=
 				{
-					["CLSID"]="{GROWLER_PYLON_04_IB_FT_FPU-12_Fueltank}",
+					["CLSID"]="{GROWLER_PYLON_08_IB_FT_FPU-12_Fueltank}",
 					["num"]=7
 				},
 				[8]=
@@ -278,7 +278,7 @@ local unitPayloads = {
 				},
 				[7]=
 				{
-					["CLSID"]="{GROWLER_PYLON_04_IB_FT_FPU-12_Fueltank}",
+					["CLSID"]="{GROWLER_PYLON_08_IB_FT_FPU-12_Fueltank}",
 					["num"]=7
 				},
 				[8]=
diff --git a/resources/customized_payloads/FA-18E.lua b/resources/customized_payloads/FA-18E.lua
index b50dab43..1f09b866 100644
--- a/resources/customized_payloads/FA-18E.lua
+++ b/resources/customized_payloads/FA-18E.lua
@@ -22,12 +22,12 @@ local unitPayloads = {
 				},
 				[4]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_05_TP_ASQ228}",
+					["CLSID"]="{SUPERHORNET_PYLON_05_AM_1X_AIM-120C}",
 					["num"]=4
 				},
 				[5]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_06_CN_FT_FPU-12_Fueltank}",
+					["CLSID"]="{A111396E-D3E8-4b9c-8AC9-2432489304D5}",
 					["num"]=5
 				},
 				[6]=
@@ -200,12 +200,12 @@ local unitPayloads = {
 				},
 				[4]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_05_TP_ASQ228}",
+					["CLSID"]="{SUPERHORNET_PYLON_05_AM_1X_AIM-120C}",
 					["num"]=4
 				},
 				[5]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_06_CN_FT_FPU-12_Fueltank}",
+					["CLSID"]="{A111396E-D3E8-4b9c-8AC9-2432489304D5}",
 					["num"]=5
 				},
 				[6]=
@@ -269,7 +269,7 @@ local unitPayloads = {
 				},
 				[6]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_05_TP_ASQ228}",
+					["CLSID"]="{AN_ASQ_228}",
 					["num"]=4
 				},
 				[7]=
@@ -328,7 +328,7 @@ local unitPayloads = {
 				},
 				[6]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_05_TP_ASQ228}",
+					["CLSID"]="{AN_ASQ_228}",
 					["num"]=4
 				},
 				[7]=
@@ -377,7 +377,7 @@ local unitPayloads = {
 				},
 				[4]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_05_TP_ASQ228}",
+					["CLSID"]="{AN_ASQ_228}",
 					["num"]=4
 				},
 				[5]=
@@ -436,12 +436,12 @@ local unitPayloads = {
 				},
 				[4]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_05_TP_ASQ228}",
+					["CLSID"]="{SUPERHORNET_PYLON_05_AM_1X_AIM-120C}",
 					["num"]=4
 				},
 				[5]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_06_CN_EMPTY}",
+					["CLSID"]="{A111396E-D3E8-4b9c-8AC9-2432489304D5}",
 					["num"]=5
 				},
 				[6]=
@@ -495,12 +495,12 @@ local unitPayloads = {
 				},
 				[4]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_05_TP_ASQ228}",
+					["CLSID"]="{SUPERHORNET_PYLON_05_AM_1X_AIM-120C}",
 					["num"]=4
 				},
 				[5]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_06_CN_EMPTY}",
+					["CLSID"]="{A111396E-D3E8-4b9c-8AC9-2432489304D5}",
 					["num"]=5
 				},
 				[6]=
@@ -555,12 +555,12 @@ local unitPayloads = {
 				},
 				[4]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_05_TP_ASQ228}",
+					["CLSID"]="{SUPERHORNET_PYLON_05_AM_1X_AIM-120C}",
 					["num"]=4
 				},
 				[5]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_06_CN_EMPTY}",
+					["CLSID"]="{A111396E-D3E8-4b9c-8AC9-2432489304D5}",
 					["num"]=5
 				},
 				[6]=
@@ -675,7 +675,7 @@ local unitPayloads = {
 				},
 				[4]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_05_TP_ASQ228}",
+					["CLSID"]="{AN_ASQ_228}",
 					["num"]=4
 				},
 				[5]=
@@ -735,12 +735,12 @@ local unitPayloads = {
 				},
 				[4]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_05_TP_ASQ228}",
+					["CLSID"]="{SUPERHORNET_PYLON_05_AM_1X_AIM-120C}",
 					["num"]=4
 				},
 				[5]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_06_CN_FT_FPU-12_Fueltank}",
+					["CLSID"]="{A111396E-D3E8-4b9c-8AC9-2432489304D5}",
 					["num"]=5
 				},
 				[6]=
diff --git a/resources/customized_payloads/FA-18F.lua b/resources/customized_payloads/FA-18F.lua
index 6650bb91..00a3b0ac 100644
--- a/resources/customized_payloads/FA-18F.lua
+++ b/resources/customized_payloads/FA-18F.lua
@@ -22,12 +22,12 @@ local unitPayloads = {
 				},
 				[4]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_05_TP_ASQ228}",
+					["CLSID"]="{SUPERHORNET_PYLON_05_AM_1X_AIM-120C}",
 					["num"]=4
 				},
 				[5]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_06_CN_FT_FPU-12_Fueltank}",
+					["CLSID"]="{A111396E-D3E8-4b9c-8AC9-2432489304D5}",
 					["num"]=5
 				},
 				[6]=
@@ -200,12 +200,12 @@ local unitPayloads = {
 				},
 				[4]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_05_TP_ASQ228}",
+					["CLSID"]="{SUPERHORNET_PYLON_05_AM_1X_AIM-120C}",
 					["num"]=4
 				},
 				[5]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_06_CN_FT_FPU-12_Fueltank}",
+					["CLSID"]="{A111396E-D3E8-4b9c-8AC9-2432489304D5}",
 					["num"]=5
 				},
 				[6]=
@@ -269,7 +269,7 @@ local unitPayloads = {
 				},
 				[6]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_05_TP_ASQ228}",
+					["CLSID"]="{AN_ASQ_228}",
 					["num"]=4
 				},
 				[7]=
@@ -328,7 +328,7 @@ local unitPayloads = {
 				},
 				[6]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_05_TP_ASQ228}",
+					["CLSID"]="{AN_ASQ_228}",
 					["num"]=4
 				},
 				[7]=
@@ -377,7 +377,7 @@ local unitPayloads = {
 				},
 				[4]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_05_TP_ASQ228}",
+					["CLSID"]="{AN_ASQ_228}",
 					["num"]=4
 				},
 				[5]=
@@ -436,12 +436,12 @@ local unitPayloads = {
 				},
 				[4]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_05_TP_ASQ228}",
+					["CLSID"]="{SUPERHORNET_PYLON_05_AM_1X_AIM-120C}",
 					["num"]=4
 				},
 				[5]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_06_CN_EMPTY}",
+					["CLSID"]="{A111396E-D3E8-4b9c-8AC9-2432489304D5}",
 					["num"]=5
 				},
 				[6]=
@@ -495,12 +495,12 @@ local unitPayloads = {
 				},
 				[4]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_05_TP_ASQ228}",
+					["CLSID"]="{SUPERHORNET_PYLON_05_AM_1X_AIM-120C}",
 					["num"]=4
 				},
 				[5]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_06_CN_EMPTY}",
+					["CLSID"]="{A111396E-D3E8-4b9c-8AC9-2432489304D5}",
 					["num"]=5
 				},
 				[6]=
@@ -555,12 +555,12 @@ local unitPayloads = {
 				},
 				[4]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_05_TP_ASQ228}",
+					["CLSID"]="{SUPERHORNET_PYLON_05_AM_1X_AIM-120C}",
 					["num"]=4
 				},
 				[5]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_06_CN_EMPTY}",
+					["CLSID"]="{A111396E-D3E8-4b9c-8AC9-2432489304D5}",
 					["num"]=5
 				},
 				[6]=
@@ -675,7 +675,7 @@ local unitPayloads = {
 				},
 				[4]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_05_TP_ASQ228}",
+					["CLSID"]="{AN_ASQ_228}",
 					["num"]=4
 				},
 				[5]=
@@ -735,12 +735,12 @@ local unitPayloads = {
 				},
 				[4]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_05_TP_ASQ228}",
+					["CLSID"]="{SUPERHORNET_PYLON_05_AM_1X_AIM-120C}",
 					["num"]=4
 				},
 				[5]=
 				{
-					["CLSID"]="{SUPERHORNET_PYLON_06_CN_FT_FPU-12_Fueltank}",
+					["CLSID"]="{A111396E-D3E8-4b9c-8AC9-2432489304D5}",
 					["num"]=5
 				},
 				[6]=