diff --git a/src/common/decisions/tianjiang_decision.txt b/src/common/decisions/tianjiang_decision.txt
index 98c67c5..82418e9 100755
--- a/src/common/decisions/tianjiang_decision.txt
+++ b/src/common/decisions/tianjiang_decision.txt
@@ -15644,6 +15644,7 @@ AZ_meizhoutiaozhan_jyz = {
 			is_ai = no
 			always = no
 		}
+		fire_only_once = yes
 		available = {
 			custom_trigger_tooltip = {
 				tooltip = "测试成就获得"
@@ -15665,6 +15666,7 @@ AZ_meizhoutiaozhan_jyz = {
 			is_ai = no
 			date < 1936.1.3
 		}
+		fire_only_once = yes
 		available = {
 			date < 1936.1.3
 			has_global_flag = az_gamestarted
@@ -15932,6 +15934,7 @@ AZ_meizhoutiaozhan_jyz = {
 			is_ai = no
 			has_global_flag = az_meizhoutiaozhan_BFL
 		}
+		fire_only_once = yes
 		available = {
 			has_completed_focus = BFL_coldwar_1
 			OR = {
diff --git a/src/common/military_industrial_organization/organizations/00_generic_organization.txt b/src/common/military_industrial_organization/organizations/00_generic_organization.txt
index 8f6e6d2..ea582f1 100755
--- a/src/common/military_industrial_organization/organizations/00_generic_organization.txt
+++ b/src/common/military_industrial_organization/organizations/00_generic_organization.txt
@@ -83,6 +83,17 @@ generic_tank_organization = {
 				has_dlc = "Gotterdammerung"
 			}
 		}
+		NOT = {
+			AND = {
+				OR = { 
+					original_tag = AFG 
+					original_tag = PER
+					original_tag = IRQ
+					original_tag = RAJ
+				}
+				has_dlc = "Graveyard of Empires"
+			}
+		}
 	}
 
 	equipment_type = { mio_cat_eq_all_light_tank mio_cat_eq_all_medium_tank }
@@ -105,7 +116,7 @@ generic_tank_organization = {
 		equipment_bonus = {
 			armor_value = -0.05
 			defense =-0.05
-			build_cost_ic = -0.03
+			build_cost_ic = -0.05
 		}
 	}
 
@@ -317,18 +328,23 @@ generic_infantry_tank_organization = {
 	research_categories = { mio_cat_tech_all_armor_and_modules }
 
 	tree_header_text = {
-		text = mio_header_light_tank_department
-		x = 0.1
+		text = mio_header_engine_and_suspension
+		x = 1
 	}
 
 	tree_header_text = {
-		text = mio_header_medium_tank_department
-		x = 4
+		text = mio_header_armament
+		x = 3
 	}
 
 	tree_header_text = {
-		text = mio_header_heavy_tank_department
-		x = 8
+		text = mio_header_production
+		x = 6
+	}
+
+	tree_header_text = {
+		text = mio_header_armor
+		x = 9
 	}
 
 	initial_trait = {
@@ -345,175 +361,169 @@ generic_infantry_tank_organization = {
 	}
 
 	trait = {
-		token = generic_mio_trait_light_tank_improvements
-		name = generic_mio_trait_light_tank_improvements
-		icon = GFX_generic_mio_department_icon_tank_light_tank_weapons
+		token = generic_mio_trait_single_engine
+		name = generic_mio_trait_single_engine
+		icon = GFX_generic_mio_trait_icon_breakthrough
 
 		position = { x=0 y=0 }
-		
-		limit_to_equipment_type = { mio_cat_eq_all_light_tank }
 
-		equipment_bonus = {
-			soft_attack = 0.05
-			hard_attack = 0.05
-			armor_value = 0.05
-		}
-	}
-
-	trait = {
-		token = generic_mio_trait_medium_tank_improvements
-		name = generic_mio_trait_medium_tank_improvements
-		icon = GFX_generic_mio_department_icon_tank_medium_tank_weapons
-
-		limit_to_equipment_type = { mio_cat_eq_all_medium_tank }
-
-		position = { x=4 y=0 }
-		relative_position_id = generic_mio_trait_light_tank_improvements
+		mutually_exclusive = { generic_mio_trait_dual_engine_redundancy }
 		
 		equipment_bonus = {
-			soft_attack = 0.05
-			hard_attack = 0.05
-			armor_value = 0.05
-		}
-
-
-	}
-	trait = {
-		token = generic_mio_trait_heavy_tank_improvements
-		name = generic_mio_trait_heavy_tank_improvements
-		icon = GFX_generic_mio_department_icon_tank_heavy_tank_weapons
-
-		position = { x=4 y=0 }
-		relative_position_id = generic_mio_trait_medium_tank_improvements
-		
-		limit_to_equipment_type = { mio_cat_eq_all_heavy_tank }
-
-		equipment_bonus = {
-			soft_attack = 0.02
-			hard_attack = 0.05
-			armor_value = 0.05
+			breakthrough = 0.05
 		}
 	}
 
-	trait = {
-		token = generic_mio_trait_production_division
-		name = generic_mio_trait_production_division
-		icon = GFX_generic_mio_department_icon_tank_general_line_efficiency
-		
-		position = { x=2 y=1 }
-		relative_position_id = generic_mio_trait_light_tank_improvements
-		
-		all_parents = { generic_mio_trait_light_tank_improvements generic_mio_trait_medium_tank_improvements }
 
-		production_bonus = {
-			production_efficiency_gain_factor = 0.15
-		}
-	}
 
 	trait = {
-		token = generic_mio_trait_standardized_turrets
-		name = generic_mio_trait_standardized_turrets
-		icon = GFX_generic_mio_department_icon_tank_general_quality
+		token = generic_mio_trait_dual_engine_redundancy
+		name = generic_mio_trait_dual_engine_redundancy
+		icon = GFX_generic_mio_trait_icon_reliability
+
+		position = { x=2 y=0 }
+
+		mutually_exclusive = { generic_mio_trait_single_engine }
 		
-		position = { x=0 y=1 }
-		relative_position_id = generic_mio_trait_production_division
-
-		any_parent = { generic_mio_trait_production_division }
-
-		equipment_bonus = {
-			soft_attack = 0.05
-			defense = 0.05
-		}
-
-		production_bonus = {
-			production_cost_factor = -0.03
-		}
-	}
-
-	trait = {
-		token = generic_mio_trait_improved_wheel_protection
-		name = generic_mio_trait_improved_wheel_protection
-		icon = GFX_generic_mio_department_icon_tank_light_tank_armor
-		
-		position = { x=0 y=2 }
-		relative_position_id = generic_mio_trait_light_tank_improvements
-		
-		any_parent = { generic_mio_trait_light_tank_improvements }
-
-		limit_to_equipment_type = { mio_cat_eq_all_light_tank }
-
 		equipment_bonus = {
 			reliability = 0.05
-			defense = 0.1
 		}
+
+
 	}
 
 	trait = {
-		token = generic_mio_trait_gun_improvements
-		name = generic_mio_trait_gun_improvements
-		icon = GFX_generic_mio_trait_icon_ap_attack
-		
-		position = { x=0 y=2 }
-		relative_position_id = generic_mio_trait_medium_tank_improvements
-
-		any_parent = { generic_mio_trait_medium_tank_improvements }
-
-		limit_to_equipment_type = { mio_cat_eq_all_medium_tank mio_cat_eq_all_heavy_tank }
-
-		equipment_bonus = {
-			hard_attack = 0.05
-			ap_attack = 0.1
-		}
-	}
-
-	trait = {
-		token = generic_mio_trait_speed_improvements
-		name = generic_mio_trait_speed_improvements
+		token = generic_mio_trait_interleaved_track_wheels
+		name = generic_mio_trait_interleaved_track_wheels
 		icon = GFX_generic_mio_trait_icon_maximum_speed
-		
-		position = { x=1 y=2 }
-		relative_position_id = generic_mio_trait_improved_wheel_protection
-	
-		any_parent = { generic_mio_trait_improved_wheel_protection generic_mio_trait_gun_improvements }
-		
-		mutually_exclusive = { generic_mio_trait_improved_protection }
-		
+
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_single_engine
+
+		any_parent = { generic_mio_trait_single_engine generic_mio_trait_dual_engine_redundancy }
+
+		mutually_exclusive = { generic_mio_trait_overlapped_track_wheels }
+
 		equipment_bonus = {
 			maximum_speed = 0.1
-			breakthrough = 0.1
 		}
-	}
-
-	trait = {
-		token = generic_mio_trait_improved_protection
-		name = generic_mio_trait_improved_protection
-		icon = GFX_generic_mio_department_icon_tank_general_armor
-		
-		position = { x=2 y=0 }
-		relative_position_id = generic_mio_trait_speed_improvements
-		
-		any_parent = { generic_mio_trait_improved_wheel_protection generic_mio_trait_gun_improvements }
-		
-		mutually_exclusive= { generic_mio_trait_speed_improvements }
-
-		equipment_bonus = {
-			armor_value = 0.1
-			defense = 0.1
-		}
-	}
-	trait = {
-		token = generic_mio_trait_modular_construction
-		name = generic_mio_trait_modular_construction
-		icon = GFX_generic_mio_department_icon_tank_general_technology
-		
-		position = { x=2 y=2 }
-		relative_position_id = generic_mio_trait_medium_tank_improvements
-		
-		any_parent = { generic_mio_trait_medium_tank_improvements }
 
 		production_bonus = {
-			production_efficiency_cap_factor = 0.1
-			production_efficiency_gain_factor = 0.1
+			production_cost_factor = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_overlapped_track_wheels
+		name = generic_mio_trait_overlapped_track_wheels
+		icon = GFX_generic_mio_trait_icon_defense
+		
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_dual_engine_redundancy
+		
+		any_parent = { generic_mio_trait_single_engine generic_mio_trait_dual_engine_redundancy }
+
+		mutually_exclusive = { generic_mio_trait_interleaved_track_wheels }
+
+		equipment_bonus = {
+			defense = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_battle_tank_specifications
+		name = generic_mio_trait_battle_tank_specifications
+		icon = GFX_generic_mio_department_icon_tank_general_armor
+		
+		position = { x=6 y=0 }
+
+		equipment_bonus = {
+			armor_value = 0.03
+			defense = 0.03
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_adaptable_turret_ring
+		name = generic_mio_trait_adaptable_turret_ring
+		icon = GFX_generic_mio_trait_icon_hard_attack
+		
+		position = { x=-3 y=1 }
+		relative_position_id = generic_mio_trait_battle_tank_specifications
+		
+		any_parent = { generic_mio_trait_battle_tank_specifications }
+
+		equipment_bonus = {
+			soft_attack = 0.05
+			hard_attack = 0.05
+			ap_attack = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_turret_sights
+		name = generic_mio_trait_turret_sights
+		icon = GFX_generic_mio_trait_icon_breakthrough
+		
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_adaptable_turret_ring
+
+		any_parent = { generic_mio_trait_adaptable_turret_ring }
+
+		equipment_bonus = {
+			soft_attack = 0.05
+			hard_attack = 0.05
+			breakthrough = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_close_support_role
+		name = generic_mio_trait_close_support_role
+		icon = GFX_generic_mio_trait_icon_soft_attack
+		
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_battle_tank_specifications
+	
+		any_parent = { generic_mio_trait_battle_tank_specifications }
+		
+		mutually_exclusive = { generic_mio_trait_anti_tank_role }
+		
+		equipment_bonus = {
+			soft_attack = 0.1
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_anti_tank_role
+		name = generic_mio_trait_anti_tank_role
+		icon = GFX_generic_mio_trait_icon_hard_attack
+		
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_battle_tank_specifications
+		
+		any_parent = { generic_mio_trait_battle_tank_specifications }
+		
+		mutually_exclusive= { generic_mio_trait_close_support_role }
+
+		equipment_bonus = {
+		hard_attack = 0.1
+		ap_attack = 0.1
+		}
+	}
+	trait = {
+		token = generic_mio_trait_adaptable_chassis
+		name = generic_mio_trait_adaptable_chassis
+		icon = GFX_generic_mio_department_icon_tank_general_technology
+		
+		position = { x=1 y=1 }
+		relative_position_id = generic_mio_trait_close_support_role
+		
+		any_parent = { generic_mio_trait_close_support_role generic_mio_trait_anti_tank_role }
+
+		production_bonus = {
+			production_efficiency_cap_factor = 0.05
+			production_efficiency_gain_factor = 0.05
 		}
 	}
 
@@ -523,9 +533,9 @@ generic_infantry_tank_organization = {
 		icon = GFX_generic_mio_department_icon_tank_light_tank_production
 		
 		position = { x=-1 y=2 }
-		relative_position_id = generic_mio_trait_modular_construction
+		relative_position_id = generic_mio_trait_adaptable_chassis
 		
-		any_parent = { generic_mio_trait_modular_construction }
+		any_parent = { generic_mio_trait_adaptable_chassis }
 		
 		mutually_exclusive= { generic_mio_trait_medium_tank_specialization generic_mio_trait_heavy_tank_specialization }
 
@@ -541,9 +551,9 @@ generic_infantry_tank_organization = {
 		icon = GFX_generic_mio_department_icon_tank_medium_tank_production
 		
 		position = { x=0 y=2 }
-		relative_position_id = generic_mio_trait_modular_construction
+		relative_position_id = generic_mio_trait_adaptable_chassis
 
-		any_parent = { generic_mio_trait_modular_construction }
+		any_parent = { generic_mio_trait_adaptable_chassis }
 		
 		mutually_exclusive= { generic_mio_trait_light_tank_specialization generic_mio_trait_heavy_tank_specialization }
 		
@@ -560,9 +570,9 @@ generic_infantry_tank_organization = {
 		icon = GFX_generic_mio_department_icon_tank_heavy_tank_production
 		
 		position = { x=1 y=2 }
-		relative_position_id = generic_mio_trait_modular_construction
+		relative_position_id = generic_mio_trait_adaptable_chassis
 
-		any_parent = { generic_mio_trait_modular_construction }
+		any_parent = { generic_mio_trait_adaptable_chassis }
 		
 		mutually_exclusive= { generic_mio_trait_light_tank_specialization generic_mio_trait_medium_tank_specialization }
 		
@@ -572,6 +582,35 @@ generic_infantry_tank_organization = {
 			production_cost_factor = -0.05
 		}
 	}
+	trait = {
+		token = generic_mio_trait_thick_armor
+		name = generic_mio_trait_thick_armor
+		icon = GFX_generic_mio_department_icon_tank_general_armor
+		
+		position = { x=3 y=1 }
+		relative_position_id = generic_mio_trait_battle_tank_specifications
+	
+		any_parent = { generic_mio_trait_battle_tank_specifications }
+		
+		equipment_bonus = {
+		armor_value = 0.05
+		}
+	}
+
+	trait = {
+		token = generic_mio_trait_even_thicker_armor
+		name = generic_mio_trait_even_thicker_armor
+		icon = GFX_generic_mio_department_icon_tank_general_armor
+		
+		position = { x=0 y=2 }
+		relative_position_id = generic_mio_trait_thick_armor
+		
+		any_parent = { generic_mio_trait_thick_armor }
+		
+		equipment_bonus = {
+		armor_value = 0.1
+		}
+	}
 }
 
 # ASSAULT GUNS DESIGNER / MANUFACTURER
@@ -2417,7 +2456,7 @@ generic_escort_ship_organization = {
 
 	allowed = {
 		NOT = { OR = { tag = BFL tag = HUJ tag = SAD tag = TIX tag = BYG tag = CHY tag = YUW tag = DOH tag = BLI tag = SIR tag = SR1 tag = SR2 tag = SR3 tag = SR4 } }
-		NOT = { OR = { tag = GER tag = ENG tag = SOV tag = FRA tag = ITA tag = JAP tag = USA tag = BEL tag = CAN tag = SWE tag = HUN tag = CZE tag = ROM tag = YUG tag = POR tag = GRE tag = TUR tag = LAT tag = EST } }
+		NOT = { OR = { original_tag = GER tag = ENG tag = SOV tag = FRA tag = ITA tag = JAP tag = USA tag = BEL tag = CAN tag = SWE tag = HUN tag = CZE tag = ROM tag = YUG tag = POR tag = GRE tag = TUR tag = LAT tag = EST } }
 		NOT = { OR = { tag = SPR tag = SPA tag = SPB tag = SPC tag = SPD } }
 		NOT = {
 			AND = {
@@ -2490,6 +2529,16 @@ generic_escort_ship_organization = {
 				
 			}
 		}
+		NOT = {
+			AND = {
+				OR = { 
+					original_tag = AFG
+					original_tag = PER 
+					original_tag = IRQ
+				}
+				has_dlc = "Graveyard of Empires"
+			}
+		}
 	}
 
 	equipment_type = {
@@ -3030,7 +3079,7 @@ generic_submarine_organization = {
 			sub_visibility = -0.05
 		}
 	}
-	
+
 	trait = {
 		token = generic_mio_trait_long_range_raiding
 		name = generic_mio_trait_long_range_raiding
@@ -3918,7 +3967,10 @@ generic_general_aircraft_organization = {
 
 	allowed = {
 		NOT = { OR = { tag = BFL tag = HUJ tag = SAD tag = TIX tag = BYG tag = CHY tag = YUW tag = DOH tag = BLI tag = SIR tag = SR1 tag = SR2 tag = SR3 tag = SR4 } }
-		NOT = { OR = { tag = GER tag = ENG tag = SOV tag = FRA tag = ITA tag = JAP tag = USA tag = BEL tag = CAN tag = YUG tag = ROM tag = CZE tag = HUN tag = CHI tag = MAN tag = HOL tag = BUL tag = GRE tag = TUR tag = LAT tag = LIT } }
+		NOT = { 
+			OR = { original_tag = GER tag = ENG tag = SOV tag = FRA tag = ITA tag = JAP tag = USA tag = BEL tag = CAN tag = YUG tag = ROM tag = CZE tag = HUN tag = CHI tag = MAN tag = HOL tag = BUL tag = GRE tag = TUR tag = LAT tag = LIT 
+			} 
+		}
 		NOT = { tag = SPR tag = SPA tag = SPB tag = SPC tag = SPD }
 		NOT = {
 			AND = {
@@ -4002,12 +4054,22 @@ generic_general_aircraft_organization = {
 				has_dlc = "Gotterdammerung"
 			}
 		}
+		NOT = {
+			AND = {
+				OR = { 
+					original_tag = AFG 
+					original_tag = PER
+					original_tag = IRQ
+				}
+				has_dlc = "Graveyard of Empires"
+			}
+		}
 	}
 
 	equipment_type = {
 		mio_cat_eq_all_small_plane
 		mio_cat_eq_all_medium_plane
-		mio_cat_eq_all_large_plane
+		mio_cat_eq_only_strategic_bomber
 	}
 
 	research_categories = { air_equipment }
@@ -4773,7 +4835,7 @@ generic_medium_aircraft_organization = {
 
 		equipment_bonus = {
 			air_ground_attack = 0.05
-			air_bombing = 0.05 #TODO_Manu: Not working
+			air_bombing = 0.05 #MM: Not working
 		}
 	}
 
@@ -4941,7 +5003,7 @@ generic_heavy_aircraft_organization = {
 	}
 
 	equipment_type = {
-		large_plane_airframe
+		mio_cat_eq_only_strategic_bomber
 		large_plane_maritime_patrol_plane_airframe
 		transport_plane_equipment
 	}
@@ -4961,7 +5023,7 @@ generic_heavy_aircraft_organization = {
 	initial_trait = {
 		name = generic_mio_initial_trait_heavy_aircraft_designer
 
-		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+		limit_to_equipment_type = { mio_cat_eq_only_strategic_bomber large_plane_maritime_patrol_plane_airframe }
 
 		organization_modifier = {
 			military_industrial_organization_research_bonus = 0.05
@@ -4979,7 +5041,7 @@ generic_heavy_aircraft_organization = {
 
 		position = { x=2 y=0 }
 
-		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+		limit_to_equipment_type = { mio_cat_eq_only_strategic_bomber large_plane_maritime_patrol_plane_airframe }
 
 		equipment_bonus = {
 			air_defence = 0.05
@@ -5029,7 +5091,7 @@ generic_heavy_aircraft_organization = {
 
 		any_parent = { generic_mio_trait_standardized_alloys }
 
-		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+		limit_to_equipment_type = { mio_cat_eq_only_strategic_bomber large_plane_maritime_patrol_plane_airframe }
 
 		equipment_bonus = {
 			air_defence = 0.05
@@ -5049,7 +5111,7 @@ generic_heavy_aircraft_organization = {
 
 		mutually_exclusive = { generic_mio_trait_high_quality_aluminium_alloys }
 
-		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+		limit_to_equipment_type = { mio_cat_eq_only_strategic_bomber large_plane_maritime_patrol_plane_airframe }
 
 		production_bonus = {
 			production_capacity_factor = 0.05
@@ -5069,7 +5131,7 @@ generic_heavy_aircraft_organization = {
 
 		mutually_exclusive = { generic_mio_trait_refined_secondary_aluminium }
 
-		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+		limit_to_equipment_type = { mio_cat_eq_only_strategic_bomber large_plane_maritime_patrol_plane_airframe }
 
 		equipment_bonus = {
 			air_agility = 0.05
@@ -5087,7 +5149,7 @@ generic_heavy_aircraft_organization = {
 
 		any_parent = { generic_mio_trait_reinforced_frames generic_mio_trait_extended_rear_fuselage }
 
-		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+		limit_to_equipment_type = { mio_cat_eq_only_strategic_bomber large_plane_maritime_patrol_plane_airframe }
 
 		equipment_bonus = {
 			air_range = 0.05
@@ -5104,7 +5166,7 @@ generic_heavy_aircraft_organization = {
 
 		any_parent = { generic_mio_trait_pressurized_cockpit }
 
-		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+		limit_to_equipment_type = { mio_cat_eq_only_strategic_bomber large_plane_maritime_patrol_plane_airframe }
 
 		equipment_bonus = {
 			air_agility = 0.05
@@ -5119,7 +5181,7 @@ generic_heavy_aircraft_organization = {
 		position = { x=6 y=0 }
 		relative_position_id = generic_mio_trait_reinforced_frames
 
-		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+		limit_to_equipment_type = { mio_cat_eq_only_strategic_bomber large_plane_maritime_patrol_plane_airframe }
 
 		equipment_bonus = {
 			air_bombing = 0.05
@@ -5139,7 +5201,7 @@ generic_heavy_aircraft_organization = {
 
 		mutually_exclusive = { generic_mio_trait_air_deployed_sonobuoys }
 
-		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+		limit_to_equipment_type = { mio_cat_eq_only_strategic_bomber large_plane_maritime_patrol_plane_airframe }
 
 		equipment_bonus = {
 			air_bombing = 0.05
@@ -5158,7 +5220,7 @@ generic_heavy_aircraft_organization = {
 
 		mutually_exclusive = { generic_mio_trait_auto_levelled_bombsights }
 
-		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+		limit_to_equipment_type = { mio_cat_eq_only_strategic_bomber large_plane_maritime_patrol_plane_airframe }
 
 		equipment_bonus = {
 			sub_detection = 0.05
@@ -5176,7 +5238,7 @@ generic_heavy_aircraft_organization = {
 
 		any_parent = { generic_mio_trait_auto_levelled_bombsights generic_mio_trait_air_deployed_sonobuoys }
 
-		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+		limit_to_equipment_type = { mio_cat_eq_only_strategic_bomber large_plane_maritime_patrol_plane_airframe }
 
 		equipment_bonus = {
 			air_attack = 0.05
@@ -5195,7 +5257,7 @@ generic_heavy_aircraft_organization = {
 
 		mutually_exclusive = { generic_mio_trait_advanced_instruments }
 
-		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+		limit_to_equipment_type = { mio_cat_eq_only_strategic_bomber large_plane_maritime_patrol_plane_airframe }
 
 		equipment_bonus = {
 			air_defence = 0.15
@@ -5217,7 +5279,7 @@ generic_heavy_aircraft_organization = {
 
 		mutually_exclusive = { generic_mio_trait_flying_fortress }
 
-		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+		limit_to_equipment_type = { mio_cat_eq_only_strategic_bomber large_plane_maritime_patrol_plane_airframe }
 
 		equipment_bonus = {
 			air_bombing = 0.05
@@ -5526,6 +5588,10 @@ generic_naval_aircraft_organization = {
 		production_bonus = {
 			production_capacity_factor = 0.05
 		}
+
+		equipment_bonus = {
+			naval_strike_attack = 0.05
+		}
 	}
 
 	trait = {
@@ -5537,6 +5603,8 @@ generic_naval_aircraft_organization = {
 
 		equipment_bonus = {
 			reliability = 0.05
+			surface_detection = 0.05
+			sub_detection = 0.05
 		}
 	}
 
@@ -5575,6 +5643,7 @@ generic_naval_aircraft_organization = {
 
 		equipment_bonus = {
 			maximum_speed = 0.05
+			naval_strike_attack = 0.05
 		}
 	}
 
@@ -5592,6 +5661,9 @@ generic_naval_aircraft_organization = {
 
 		equipment_bonus = {
 			surface_detection = 0.05
+			sub_detection = 0.05
+			naval_strike_attack = 0.05
+			naval_strike_targetting = 0.05
 		}
 	}
 
@@ -5659,6 +5731,7 @@ generic_naval_aircraft_organization = {
 
 		equipment_bonus = {
 			air_attack = 0.05
+			air_ground_attack = 0.05
 		}
 	}
 
@@ -5673,7 +5746,8 @@ generic_naval_aircraft_organization = {
 		all_parents = { generic_mio_strength_wing_design }
 
 		equipment_bonus = {
-			air_ground_attack = 0.05
+			naval_strike_attack = 0.05
+			naval_strike_targetting = 0.05
 		}
 	}
 
@@ -5975,7 +6049,7 @@ generic_multi_role_aircraft_organization = {
 		equipment_bonus = {
 			air_ground_attack = 0.05
 			naval_strike_attack = 0.05
-			air_bombing = 0.05 #TODO_Manu: NOT WORKING
+			air_bombing = 0.05 #MM: NOT WORKING
 		}
 	}
 
@@ -6726,7 +6800,7 @@ generic_artillery_organization = {
 
 	allowed = {
 		NOT = { OR = { tag = BFL tag = HUJ tag = SAD tag = TIX tag = BYG tag = CHY tag = YUW tag = DOH tag = BLI tag = SIR tag = SR1 tag = SR2 tag = SR3 tag = SR4 } }
-		NOT = { OR = { tag = GER tag = ENG tag = SOV tag = FRA tag = ITA tag = USA tag = JAP tag = CZE tag = ROM tag = MEX } }
+		NOT = { OR = { original_tag = GER tag = ENG tag = SOV tag = FRA tag = ITA tag = USA tag = JAP tag = CZE tag = ROM tag = MEX } }
 		NOT = {
 			AND = {
 				tag = POL
@@ -6809,6 +6883,17 @@ generic_artillery_organization = {
 				
 			}
 		}
+		NOT = {
+			AND = {
+				OR = {
+					original_tag = AFG
+					original_tag = PER
+					original_tag = IRQ					
+				}
+				has_dlc = "Graveyard of Empires"
+				
+			}
+		}
 	}
 
 
@@ -7120,7 +7205,7 @@ generic_infantry_equipment_organization = {
 
 	allowed = {
 		NOT = { OR = { tag = BFL tag = HUJ tag = SAD tag = TIX tag = BYG tag = CHY tag = YUW tag = DOH tag = BLI tag = SIR tag = SR1 tag = SR2 tag = SR3 tag = SR4 } }
-		NOT = { OR = { tag = GER tag = ENG tag = SOV tag = FRA tag = ITA tag = JAP tag = USA tag = BEL tag = CZE tag = HUN tag = YUG tag = ROM tag = MEX tag = TUR tag = EST } }
+		NOT = { OR = { original_tag = GER tag = ENG tag = SOV tag = FRA tag = ITA tag = JAP tag = USA tag = BEL tag = CZE tag = HUN tag = YUG tag = ROM tag = MEX tag = TUR tag = EST } }
 		NOT = {
 			AND = {
 				tag = POL
@@ -7202,6 +7287,17 @@ generic_infantry_equipment_organization = {
 				
 			}
 		}
+		NOT = {
+			AND = {
+				OR = {
+					original_tag = AFG
+					original_tag = PER	
+					original_tag = IRQ				
+				}
+				has_dlc = "Graveyard of Empires"
+				
+			}
+		}
 	}
 
 	equipment_type = {
@@ -7756,7 +7852,7 @@ generic_motorized_mechanized_organization = {
 
 	allowed = {
 		NOT = { OR = { tag = BFL tag = HUJ tag = SAD tag = TIX tag = BYG tag = CHY tag = YUW tag = DOH tag = BLI tag = SIR tag = SR1 tag = SR2 tag = SR3 tag = SR4 } }
-		NOT = { OR = { tag = GER tag = ENG tag = SOV tag = FRA tag = ITA tag = JAP tag = USA tag = CZE tag = ROM tag = MEX } }
+		NOT = { OR = { original_tag = GER tag = ENG tag = SOV tag = FRA tag = ITA tag = JAP tag = USA tag = CZE tag = ROM tag = MEX } }
 		NOT = {
 			AND = {
 				tag = POL
@@ -7836,6 +7932,18 @@ generic_motorized_mechanized_organization = {
 				
 			}
 		}
+		NOT = {
+			AND = {
+				OR = {
+					original_tag = AFG
+					original_tag = PER
+					original_tag = RAJ			
+					original_tag = IRQ		
+				}
+				has_dlc = "Graveyard of Empires"
+				
+			}
+		}
 	}
 
 	equipment_type = {
@@ -8371,12 +8479,12 @@ generic_helicopter_organization = {
 	research_categories = { helicopter_tech } 
 
 	tree_header_text = {
-		text = mio_header_single_rotor
+		text = mio_header_tandem_rotor
 		x = 1
 	}
 
 	tree_header_text = {
-		text = mio_header_tandem_rotor
+		text = mio_header_single_rotor
 		x = 3
 	}
 
diff --git a/src/common/military_industrial_organization/organizations/BFL_organization.txt b/src/common/military_industrial_organization/organizations/BFL_organization.txt
index 82e4c6d..f948897 100755
--- a/src/common/military_industrial_organization/organizations/BFL_organization.txt
+++ b/src/common/military_industrial_organization/organizations/BFL_organization.txt
@@ -436,7 +436,7 @@ BFL_okmo_organization = {
 		special_trait_background = yes
 
 		position = { x=0 y=1 }  
-		relative_position_id = BFL_okmo_organization_up
+		relative_position_id = BFL_mio_trait_merge_ural_heavy_machine_building_plant
 
 		visible = {
 			FROM = { original_tag = BFL }
diff --git a/src/localisation/simp_chinese/az_organization_l_simp_chinese.yml b/src/localisation/simp_chinese/az_organization_l_simp_chinese.yml
index 3273c93..5cd8965 100755
--- a/src/localisation/simp_chinese/az_organization_l_simp_chinese.yml
+++ b/src/localisation/simp_chinese/az_organization_l_simp_chinese.yml
@@ -132,6 +132,7 @@
   BYG_ford_motor_company_organization: "福特汽车公司"
   BYG_rock_island_arsenal_organization: "岩岛兵工厂"
   BYG_armor_up_mio_trait_arsenal_of_democracy: "民主兵工厂"
+  BYG_mio_trait_arsenal_of_democracy: "民主兵工厂"
   ##重樱军工组织##
   CHY_osaka_army_arsenal_organization: "大阪陆军兵工厂"
   CHY_kure_naval_arsenal_organization: "吴海军工厂"