diff --git a/src/common/ai_equipment/BFL_tank.txt b/src/common/ai_equipment/BFL_tank.txt
index 84ffb40..42235d9 100755
--- a/src/common/ai_equipment/BFL_tank.txt
+++ b/src/common/ai_equipment/BFL_tank.txt
@@ -1,221 +1,3 @@
-BFL_light_tanks = {
-	category = land
-	blocked_for = {}
-	available_for = { BFL }
-	roles = {
-		land_light_tank
-	}
-	priority = {
-		factor = 3000
-	}
-	basic_light_tank_default = { #Somua S35
-		priority = {
-			factor = 300
-			modifier = { 
-				has_tech = improved_light_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = light_tank_chassis_1
-			modules = {
-				main_armament_slot = tank_close_support_gun
-				turret_type_slot = tank_light_three_man_tank_turret
-				suspension_type_slot = tank_wheeled_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = extra_ammo_storage
-				special_type_slot_3 = extra_ammo_storage
-				special_type_slot_4 = extra_ammo_storage
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_heavy_machine_gun
-			tank_close_support_gun
-			tank_light_three_man_tank_turret
-			tank_wheeled_suspension
-			tank_riveted_armor
-			tank_diesel_engine
-			extra_ammo_storage
-			easy_maintenance
-		}
-	}
-	improved_light_tank_default = {#AMC 35
-		priority = {
-			factor = 400
-			modifier = { 
-				has_tech = advanced_light_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = light_tank_chassis_2
-			modules = {
-				main_armament_slot = tank_close_support_gun
-				turret_type_slot = tank_light_three_man_tank_turret
-				suspension_type_slot = tank_wheeled_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = extra_ammo_storage
-				special_type_slot_3 = extra_ammo_storage
-				special_type_slot_4 = extra_ammo_storage
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_heavy_machine_gun
-			tank_close_support_gun
-			tank_light_three_man_tank_turret
-			tank_wheeled_suspension
-			tank_riveted_armor
-			tank_diesel_engine
-			easy_maintenance
-			extra_ammo_storage
-		}
-	}
-	advanced_light_tank_default = { #SARL42
-		priority = {
-			factor = 500
-		}
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = light_tank_chassis_3
-			modules = {
-				main_armament_slot = tank_close_support_gun
-				turret_type_slot = tank_light_three_man_tank_turret
-				suspension_type_slot = tank_wheeled_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = extra_ammo_storage
-				special_type_slot_3 = extra_ammo_storage
-				special_type_slot_4 = extra_ammo_storage
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_heavy_machine_gun
-			tank_close_support_gun
-			tank_light_three_man_tank_turret
-			tank_wheeled_suspension
-			tank_riveted_armor
-			tank_diesel_engine
-			extra_ammo_storage
-			easy_maintenance
-		}
-	}
-}
-
-BFL_medium_flame_tank = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = {BFL}
-
-	roles = {
-		land_medium_tank_flamethrower
-	}
-
-	priority = {
-		factor = 15000
-	}
-
-	basic_medium_flame_tank_default = {
-		priority = {
-			factor = 10000
-			modifier = { 
-				has_tech = improved_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 10000
-			type = medium_tank_flame_chassis
-			modules = {
-				main_armament_slot = flamethrower
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-
-		allowed_modules = {
-		    flamethrower
-			tank_light_one_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_diesel_engine
-			easy_maintenance
-		}
-	}
-	improved_medium_flame_tank_default = {
-		priority = {
-			factor = 10000
-			modifier = { 
-				NOT = { has_tech = improved_medium_tank_chassis }
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 10000
-			type = medium_tank_flame_chassis
-			modules = {
-				main_armament_slot = advanced_flamethrower
-				turret_type_slot = tank_light_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = extra_ammo_storage
-				special_type_slot_3 = extra_ammo_storage
-				special_type_slot_4 = extra_ammo_storage
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-
-		allowed_modules = {
-		    advanced_flamethrower
-			tank_light_fixed_superstructure_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_diesel_engine
-			easy_maintenance
-			extra_ammo_storage
-		}
-	}
-}
 
 BFL_medium_tanks = {
 	category = land
@@ -308,13 +90,7 @@ BFL_medium_tanks = {
 				suspension_type_slot = tank_bogie_suspension
 				armor_type_slot = tank_riveted_armor
 				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
+				special_type_slot_1 = tank_radio_1
 				special_type_slot_2 = secondary_turret_small_cannon
 				special_type_slot_3 = easy_maintenance
 				special_type_slot_4 = secondary_turret_small_cannon
@@ -359,13 +135,7 @@ BFL_medium_tanks = {
 				suspension_type_slot = tank_bogie_suspension
 				armor_type_slot = tank_riveted_armor
 				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
+				special_type_slot_1 = tank_radio_1
 				special_type_slot_2 = secondary_turret_small_cannon
 				special_type_slot_3 = easy_maintenance
 				special_type_slot_4 = secondary_turret_small_cannon
@@ -410,13 +180,7 @@ BFL_medium_tanks = {
 				suspension_type_slot = tank_bogie_suspension
 				armor_type_slot = tank_riveted_armor
 				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
+				special_type_slot_1 = tank_radio_1
 				special_type_slot_2 = secondary_turret_small_cannon
 				special_type_slot_3 = easy_maintenance
 				special_type_slot_4 = secondary_turret_small_cannon
@@ -442,1051 +206,4 @@ BFL_medium_tanks = {
 			easy_maintenance
 		}
 	}
-}
-
-BFL_medium_tank_destroyers = {
-	category = land
-	blocked_for = {}
-	available_for = { BFL }
-	roles = {
-		land_medium_tank_destroyer
-	}
-	priority = {
-		factor = 3000
-	}
-	medium_tank_destroyer_1 = { #Somua S35
-		priority = {
-			factor = 100
-			modifier = { 
-				has_tech = improved_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_destroyer_chassis_1
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-						tank_high_velocity_cannon_3
-					    tank_heavy_cannon_3
-						tank_high_velocity_cannon_2
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-						tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = secondary_turret_small_cannon
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = extra_ammo_storage
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_bogie_suspension
-		    tank_riveted_armor
-			tank_diesel_engine
-			secondary_turret_small_cannon
-			extra_ammo_storage
-			easy_maintenance
-		}
-	}
-	medium_tank_destroyer_2 = {#AMC 35
-		priority = {
-			factor = 200
-			modifier = { 
-				has_tech = advanced_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_destroyer_chassis_2
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-						tank_high_velocity_cannon_3
-					    tank_heavy_cannon_3
-						tank_high_velocity_cannon_2
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-						tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = secondary_turret_small_cannon
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = extra_ammo_storage
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_bogie_suspension
-		    tank_riveted_armor
-			tank_diesel_engine
-			secondary_turret_small_cannon
-			extra_ammo_storage
-			easy_maintenance
-		}
-	}
-	medium_tank_destroyer_3 = { #SARL42
-		priority = {
-			factor = 300
-			modifier = { 
-				NOT = { has_tech = advanced_medium_tank_chassis } 
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_destroyer_chassis
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-						tank_high_velocity_cannon_3
-					    tank_heavy_cannon_3
-						tank_high_velocity_cannon_2
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-						tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = secondary_turret_small_cannon
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = extra_ammo_storage
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_bogie_suspension
-		    tank_riveted_armor
-			tank_diesel_engine
-			secondary_turret_small_cannon
-			extra_ammo_storage
-			easy_maintenance
-		}
-	}
-}
-
-BFL_medium_tank_anti_air = {
-	category = land
-	blocked_for = {}
-	available_for = { BFL }
-	roles = {
-		land_medium_tank_anti_air
-	}
-	priority = {
-		factor = 500
-	}
-	medium_tank_anti_air_0 = { #Somua S35
-		priority = {
-			factor = 300
-			modifier = { 
-				has_tech = basic_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_aa_chassis_0
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_anti_air_cannon_2
-						tank_anti_air_cannon
-					} 
-				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 10
-			}
-		}
-		allowed_modules = {
-            tank_anti_air_cannon_2
-			tank_anti_air_cannon
-		    tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_diesel_engine 
-			tank_bogie_suspension
-			sloped_armor
-			armor_skirts
-			easy_maintenance
-		}
-	}
-	medium_tank_anti_air_1 = { #Somua S35
-		priority = {
-			factor = 300
-			modifier = { 
-				has_tech = improved_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_aa_chassis_1
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_anti_air_cannon_2
-						tank_anti_air_cannon
-					} 
-				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 10
-			}
-		}
-		allowed_modules = {
-            tank_anti_air_cannon_2
-			tank_anti_air_cannon
-		    tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_diesel_engine
-			tank_bogie_suspension
-			sloped_armor
-			armor_skirts
-			easy_maintenance
-		}
-	}
-	medium_tank_anti_air_2 = {#AMC 35
-		priority = {
-			factor = 400
-			modifier = { 
-				has_tech = advanced_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_aa_chassis_2
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_anti_air_cannon_2
-						tank_anti_air_cannon
-					} 
-				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-		    tank_anti_air_cannon_2
-			tank_anti_air_cannon
-		    tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_diesel_engine
-			tank_bogie_suspension
-			sloped_armor
-			armor_skirts
-			easy_maintenance
-		}
-	}
-	medium_tank_anti_air_3 = { #SARL42
-		priority = {
-			factor = 1000
-			modifier = { 
-				NOT = { has_tech = advanced_medium_tank_chassis } 
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_aa_chassis_3
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_anti_air_cannon_2
-						tank_anti_air_cannon
-					} 
-				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-		    tank_anti_air_cannon_2
-			tank_anti_air_cannon
-		    tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_diesel_engine
-			tank_bogie_suspension
-			sloped_armor
-			armor_skirts
-			easy_maintenance
-		}
-	}
-}
-
-BFL_heavy_tanks = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = { BFL }
-
-	roles = {
-		land_heavy_tank
-	}
-
-	priority = {
-		factor = 0
-	}
-	
-	basic_heavy_tank_default = { #Somua S35
-		priority = {
-			factor = 0
-			modifier = { 
-				has_tech = improved_heavy_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_chassis_1
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_heavy_three_man_tank_turret
-				suspension_type_slot = tank_torsion_bar_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-
-		allowed_modules = {
-		    tank_heavy_cannon_3
-		    tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_close_support_gun
-			tank_heavy_three_man_tank_turret
-			tank_torsion_bar_suspension
-			tank_welded_armor
-			tank_diesel_engine
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			secondary_turret_small_cannon
-			easy_maintenance
-		}
-	}
-
-	improved_heavy_tank_default = {#AMC 35
-		priority = {
-			factor = 0
-			modifier = { 
-				has_tech = advanced_heavy_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_chassis_2
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_heavy_three_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = 4
-			}
-		}
-
-		allowed_modules = {
-			tank_heavy_cannon_3
-		    tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_close_support_gun
-			tank_heavy_three_man_tank_turret
-			tank_bogie_suspension
-			tank_welded_armor
-			tank_diesel_engine
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			secondary_turret_small_cannon
-			easy_maintenance
-		}
-	}
-
-	advanced_heavy_tank_default = { #SARL42
-		priority = {
-			factor = 0
-		}
-
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_chassis_3
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_heavy_three_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = 4
-			}
-		}
-
-		allowed_modules = {
-		    tank_heavy_cannon_3
-		    tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_close_support_gun
-			tank_heavy_three_man_tank_turret
-			tank_bogie_suspension
-			tank_welded_armor
-			tank_diesel_engine
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			secondary_turret_small_cannon
-			easy_maintenance
-		}
-	}
-}
-
-BFL_heavy_tank_destroyers = {
-	category = land
-	blocked_for = {}
-	available_for = { BFL }
-	roles = {
-		land_heavy_tank_destroyer
-	}
-	priority = {
-		factor = 0
-	}
-	heavy_tank_destroyer_1 = { #Somua S35
-		priority = {
-			factor = 0
-			modifier = { 
-				has_tech = improved_heavy_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_destroyer_chassis_1
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = armor_skirts
-				special_type_slot_2 = sloped_armor
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 14
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_bogie_suspension
-		    tank_cast_armor
-			tank_diesel_engine
-			armor_skirts
-			sloped_armor
-			easy_maintenance
-		}
-	}
-	heavy_tank_destroyer_2 = {#AMC 35
-		priority = {
-			factor = 0
-			modifier = { 
-				has_tech = advanced_heavy_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_destroyer_chassis_2
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = armor_skirts
-				special_type_slot_2 = sloped_armor
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 12
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_bogie_suspension
-		    tank_cast_armor
-			tank_diesel_engine
-			armor_skirts
-			sloped_armor
-			easy_maintenance
-		}
-	}
-	heavy_tank_destroyer_3 = { #SARL42
-		priority = {
-			factor = 0
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_destroyer_chassis_3
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = armor_skirts
-				special_type_slot_2 = sloped_armor
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 12
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_bogie_suspension
-		    tank_cast_armor
-			tank_diesel_engine
-			armor_skirts
-			sloped_armor
-			easy_maintenance
-		}
-	}
-}
-
-BFL_heavy_tank_artillery = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = {BFL}
-
-	roles = {
-		land_heavy_tank_artillery
-	}
-
-	priority = {
-		factor = 0
-	}
-	heavy_tank_artillery_1 = {
-		priority = {
-			factor = 0
-			
-		}
-		enable = {
-			has_tech = interwar_artillery
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_artillery_chassis_1
-			modules = {
-				main_armament_slot = tank_medium_howitzer
-				turret_type_slot = tank_heavy_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = empty
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 4
-				tank_nsb_armor_upgrade = {
-					base = 3
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_medium_howitzer
-			tank_heavy_fixed_superstructure_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-		}
-	}
-	heavy_tank_artillery_2 = {
-		priority = {
-			factor = 0
-			
-		}
-		enable = {
-				has_tech = interwar_artillery
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 1500
-			type = heavy_tank_artillery_chassis_2
-			modules = {
-				main_armament_slot = tank_medium_howitzer_2
-				turret_type_slot = tank_heavy_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = extra_ammo_storage
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = {
-					base = 4
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_medium_howitzer_2
-			tank_heavy_fixed_superstructure_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			extra_ammo_storage
-		}
-	}
-
-	heavy_tank_artillery_3 = {
-		priority = {
-			factor = 0
-			
-		}
-		enable = {
-			has_tech = artillery5
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 2000
-			type = heavy_tank_artillery_chassis_3
-			modules = {
-				main_armament_slot = tank_heavy_howitzer
-				turret_type_slot = tank_heavy_fixed_superstructure_turret
-				suspension_type_slot = tank_interleaved_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = extra_ammo_storage
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 6
-				tank_nsb_armor_upgrade = {
-					base = 8
-					modifier = {
-						add = 4
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_heavy_howitzer
-			tank_heavy_fixed_superstructure_turret
-			tank_interleaved_suspension
-			tank_welded_armor
-			tank_gasoline_engine
-			extra_ammo_storage
-		}
-	}
-}
-
-BFL_heavy_tank_anti_air = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = {BFL}
-
-	roles = {
-		land_heavy_tank_anti_air
-	}
-
-	priority = {
-		factor = 0
-	}
-	heavy_tank_anti_air_1 = {
-		priority = {
-			factor = 1
-			
-		}
-		enable = {
-			has_tech = interwar_antiair
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_aa_chassis_1
-			modules = {
-				main_armament_slot = tank_anti_air_cannon
-				turret_type_slot = tank_heavy_two_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = empty
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 4
-				tank_nsb_armor_upgrade = {
-					base = 3
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_anti_air_cannon
-			tank_heavy_two_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-		}
-	}
-	heavy_tank_anti_air_2 = {
-		priority = {
-			factor = 0
-		}
-		enable = {
-			has_tech = antiair2
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 1500
-			type = heavy_tank_aa_chassis_2
-			modules = {
-				main_armament_slot = tank_anti_air_cannon_2
-				turret_type_slot = tank_heavy_two_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = empty
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 4
-				tank_nsb_armor_upgrade = {
-					base = 2
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_anti_air_cannon_2
-			tank_heavy_two_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-		}
-	}
-
-	heavy_tank_anti_air_3 = {
-		priority = {
-			factor = 0
-		}
-		enable = {
-			has_tech = antiair5
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 2500
-			type = heavy_tank_aa_chassis_3
-			modules = {
-				main_armament_slot = tank_anti_air_cannon_3
-				turret_type_slot = tank_heavy_two_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = empty
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = {
-					base = 3
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_anti_air_cannon_3
-			tank_heavy_two_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-		}
-	}
 }
\ No newline at end of file
diff --git a/src/common/ai_equipment/BLI_tank.txt b/src/common/ai_equipment/BLI_tank.txt
index 4b067f3..01beca8 100755
--- a/src/common/ai_equipment/BLI_tank.txt
+++ b/src/common/ai_equipment/BLI_tank.txt
@@ -1,7 +1,7 @@
 BLI_heavy_tanks = {
 	category = land
 
-	blocked_for = {}
+	blocked_for = { TIX SAD YUW HUJ BYG BFL BYG WEX DOH DH1 }
 
 	available_for = { BLI }
 
@@ -374,7 +374,7 @@ BLI_heavy_tank_destroyers = {
 BLI_medium_flame_tank = {
 	category = land
 
-	blocked_for = {}
+	blocked_for = { TIX SAD YUW HUJ BYG BFL BYG WEX DOH DH1 }
 
 	available_for = {BLI}
 
@@ -424,7 +424,7 @@ BLI_medium_flame_tank = {
 
 BLI_light_tanks = {
 	category = land
-	blocked_for = {}
+	blocked_for = { TIX SAD YUW HUJ BYG BFL BYG WEX DOH DH1 }
 	available_for = { BLI }
 	roles = {
 		land_light_tank
diff --git a/src/common/ai_equipment/BYG_tank.txt b/src/common/ai_equipment/BYG_tank.txt
index 432418d..d1fd1c6 100755
--- a/src/common/ai_equipment/BYG_tank.txt
+++ b/src/common/ai_equipment/BYG_tank.txt
@@ -1,837 +1,3 @@
-BYG_light_tanks = {
-	category = land
-	blocked_for = {}
-	available_for = { BYG }
-	roles = {
-		land_light_tank
-	}
-	priority = {
-		factor = 3000
-	}
-	basic_light_tank_default = { #Somua S35
-		priority = {
-			factor = 1000
-			modifier = { 
-				has_tech = improved_light_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		target_variant = {
-			match_value = 1000
-			type = light_tank_chassis_1
-			modules = {
-				main_armament_slot = tank_close_support_gun
-				turret_type_slot = tank_light_three_man_tank_turret
-				suspension_type_slot = tank_wheeled_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = additional_machine_guns
-				special_type_slot_3 = additional_machine_guns
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_heavy_machine_gun
-			tank_close_support_gun
-			tank_light_three_man_tank_turret
-			tank_wheeled_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			additional_machine_guns
-			secondary_turret_small_cannon
-			easy_maintenance
-		}
-	}
-	improved_light_tank_default = {#AMC 35
-		priority = {
-			factor = 2000
-			modifier = { 
-				has_tech = advanced_light_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = light_tank_chassis_2
-			modules = {
-				main_armament_slot = tank_close_support_gun
-				turret_type_slot = tank_light_three_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = additional_machine_guns
-				special_type_slot_3 = additional_machine_guns
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_heavy_machine_gun
-			tank_close_support_gun
-			tank_light_three_man_tank_turret
-			tank_christie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			additional_machine_guns
-			secondary_turret_small_cannon
-			easy_maintenance
-		}
-	}
-	advanced_light_tank_default = { #SARL42
-		priority = {
-			factor = 3000
-		}
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = light_tank_chassis_3
-			modules = {
-				main_armament_slot = tank_close_support_gun
-				turret_type_slot = tank_light_three_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = additional_machine_guns
-				special_type_slot_3 = additional_machine_guns
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_heavy_machine_gun
-			tank_close_support_gun
-			tank_light_three_man_tank_turret
-			tank_christie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			additional_machine_guns
-			secondary_turret_small_cannon
-			easy_maintenance
-		}
-	}
-}
-
-BYG_medium_flame_tank = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = {BYG}
-
-	roles = {
-		land_medium_tank_flamethrower
-	}
-
-	priority = {
-		factor = 15000
-	}
-
-	basic_medium_flame_tank_default = {
-		priority = {
-			factor = 10000
-			modifier = { 
-				has_tech = improved_medium_tank_chassis 
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 10000
-			type = medium_tank_flame_chassis
-			modules = {
-				main_armament_slot = flamethrower
-				turret_type_slot = tank_light_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-
-		allowed_modules = {
-		    flamethrower
-			tank_light_fixed_superstructure_turret
-			tank_christie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			easy_maintenance
-		}
-	}
-	improved_medium_flame_tank_default = {
-		priority = {
-			factor = 10000
-			modifier = { 
-				NOT = { has_tech = improved_medium_tank_chassis }
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 10000
-			type = medium_tank_flame_chassis
-			modules = {
-				main_armament_slot = advanced_flamethrower
-				turret_type_slot = tank_light_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = extra_ammo_storage
-				special_type_slot_3 = extra_ammo_storage
-				special_type_slot_4 = extra_ammo_storage
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-
-		allowed_modules = {
-		    advanced_flamethrower
-			tank_light_fixed_superstructure_turret
-			tank_christie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			easy_maintenance
-			extra_ammo_storage
-		}
-	}
-}
-
-BYG_medium_tanks = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = { BYG }
-
-	roles = {
-		land_medium_tank
-	}
-
-	priority = {
-		factor = 10000
-	}
-
-	medium_tank_default = {
-		priority = {
-			factor = 100
-			modifier = { 
-				has_tech = basic_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_chassis_0
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-						tank_medium_cannon_2
-						tank_high_velocity_cannon
-						tank_medium_cannon
-						tank_small_cannon_2
-						tank_small_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_three_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = secondary_turret_small_cannon
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_small_cannon 
-			tank_small_cannon_2 
-			tank_close_support_gun 
-			tank_high_velocity_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_medium_three_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_diesel_engine
-			secondary_turret_small_cannon
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			easy_maintenance
-		}
-	}
-	
-	basic_medium_tank_default = { #Somua S35
-		priority = {
-			factor = 20
-			modifier = { 
-				has_tech = improved_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_chassis_1
-			modules = {
-				main_armament_slot = tank_medium_cannon_2
-				turret_type_slot = tank_medium_three_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = easy_maintenance
-				special_type_slot_3 = secondary_turret_small_cannon
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-
-		allowed_modules = {
-			tank_small_cannon 
-			tank_small_cannon_2 
-			tank_close_support_gun 
-			tank_high_velocity_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_medium_three_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_diesel_engine
-			secondary_turret_small_cannon
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			easy_maintenance
-		}
-	}
-
-	improved_medium_tank_default = {#AMC 35
-		priority = {
-			factor = 300
-			modifier = { 
-				has_tech = advanced_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_chassis_2
-			modules = {
-				main_armament_slot = tank_medium_cannon_2
-				turret_type_slot = tank_medium_three_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = easy_maintenance
-				special_type_slot_3 = secondary_turret_small_cannon
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-
-		allowed_modules = {
-			tank_small_cannon 
-			tank_small_cannon_2 
-			tank_close_support_gun 
-			tank_high_velocity_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_medium_three_man_tank_turret
-			tank_christie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			secondary_turret_small_cannon
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			easy_maintenance
-		}
-	}
-
-	advanced_medium_tank_default = { #SARL42
-		priority = {
-			factor = 200
-			modifier = { 
-				NOT = { has_tech = advanced_medium_tank_chassis } 
-				factor = 0 #let's not waste XP here
-			}
-		}
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_chassis_3
-			modules = {
-				main_armament_slot = tank_medium_cannon_2
-				turret_type_slot = tank_medium_three_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = easy_maintenance
-				special_type_slot_3 = secondary_turret_small_cannon
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 4
-				tank_nsb_armor_upgrade = 4
-			}
-		}
-
-		allowed_modules = {
-			tank_small_cannon 
-			tank_small_cannon_2 
-			tank_close_support_gun 
-			tank_high_velocity_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_medium_three_man_tank_turret
-			tank_christie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			secondary_turret_small_cannon
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			easy_maintenance
-		}
-	}
-}
-
-BYG_medium_tank_destroyers = {
-	category = land
-	blocked_for = {}
-	available_for = { BYG }
-	roles = {
-		land_medium_tank_destroyer
-	}
-	priority = {
-		factor = 3000
-	}
-	medium_tank_destroyer_1 = { #Somua S35
-		priority = {
-			factor = 100
-			modifier = { 
-				has_tech = improved_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_destroyer_chassis_1
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-						tank_high_velocity_cannon_3
-					    tank_heavy_cannon_3
-						tank_high_velocity_cannon_2
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-						tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = secondary_turret_small_cannon
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 10
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_christie_suspension
-		    tank_riveted_armor
-			tank_gasoline_engine
-            secondary_turret_small_cannon		
-            sloped_armor	
-			easy_maintenance
-		}
-	}
-	medium_tank_destroyer_2 = {#AMC 35
-		priority = {
-			factor = 200
-			modifier = { 
-				has_tech = advanced_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_destroyer_chassis_2
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-						tank_high_velocity_cannon_3
-					    tank_heavy_cannon_3
-						tank_high_velocity_cannon_2
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-						tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = secondary_turret_small_cannon
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = extra_ammo_storage
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-		    tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_christie_suspension
-		    tank_riveted_armor
-			tank_gasoline_engine
-            secondary_turret_small_cannon		
-            extra_ammo_storage	
-			easy_maintenance
-		}
-	}
-	medium_tank_destroyer_3 = { #SARL42
-		priority = {
-			factor = 300
-			modifier = { 
-				NOT = { has_tech = advanced_medium_tank_chassis } 
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_destroyer_chassis
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-						tank_high_velocity_cannon_3
-					    tank_heavy_cannon_3
-						tank_high_velocity_cannon_2
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-						tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = secondary_turret_small_cannon
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = extra_ammo_storage
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-		    tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_christie_suspension
-		    tank_riveted_armor
-			tank_gasoline_engine
-            secondary_turret_small_cannon		
-            extra_ammo_storage	
-			easy_maintenance
-		}
-	}
-}
-
-BYG_medium_tank_anti_air = {
-	category = land
-	blocked_for = {}
-	available_for = { BYG }
-	roles = {
-		land_medium_tank_anti_air
-	}
-	priority = {
-		factor = 500
-	}
-	medium_tank_anti_air_0 = { #Somua S35
-		priority = {
-			factor = 300
-			modifier = { 
-				has_tech = basic_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_aa_chassis_0
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_anti_air_cannon_2
-						tank_anti_air_cannon
-					} 
-				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 9
-				tank_nsb_armor_upgrade = 9
-			}
-		}
-		allowed_modules = {
-            tank_anti_air_cannon_2
-			tank_anti_air_cannon
-		    tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_gasoline_engine 
-			tank_christie_suspension
-			sloped_armor
-			armor_skirts
-			easy_maintenance
-		}
-	}
-	medium_tank_anti_air_1 = { #Somua S35
-		priority = {
-			factor = 300
-			modifier = { 
-				has_tech = improved_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_aa_chassis_1
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_anti_air_cannon_2
-						tank_anti_air_cannon
-					} 
-				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 14
-				tank_nsb_armor_upgrade = 10
-			}
-		}
-		allowed_modules = {
-            tank_anti_air_cannon_2
-			tank_anti_air_cannon
-		    tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_gasoline_engine 
-			tank_christie_suspension
-			sloped_armor
-			armor_skirts
-			easy_maintenance
-		}
-	}
-	medium_tank_anti_air_2 = {#AMC 35
-		priority = {
-			factor = 400
-			modifier = { 
-				has_tech = advanced_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_aa_chassis_2
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_anti_air_cannon_2
-						tank_anti_air_cannon
-					} 
-				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 15
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-		    tank_anti_air_cannon_2
-			tank_anti_air_cannon
-		    tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_gasoline_engine 
-			tank_christie_suspension
-			sloped_armor
-			armor_skirts
-			easy_maintenance
-		}
-	}
-	medium_tank_anti_air_3 = { #SARL42
-		priority = {
-			factor = 1000
-			modifier = { 
-				NOT = { has_tech = advanced_medium_tank_chassis } 
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_aa_chassis_3
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_anti_air_cannon_2
-						tank_anti_air_cannon
-					} 
-				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 15
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-		    tank_anti_air_cannon_2
-			tank_anti_air_cannon
-		    tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_gasoline_engine 
-			tank_christie_suspension
-			sloped_armor
-			armor_skirts
-			easy_maintenance
-		}
-	}
-}
 
 BYG_medium_tank_amphibious = {
 	category = land
@@ -1205,676 +371,4 @@ BYG_medium_tank_artillery = {
 			easy_maintenance
 		}
 	}
-}
-
-BYG_heavy_tanks = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = { BYG }
-
-	roles = {
-		land_heavy_tank
-	}
-
-	priority = {
-		factor = 0
-	}
-	
-	basic_heavy_tank_default = { #Somua S35
-		priority = {
-			factor = 0
-			modifier = { 
-				has_tech = improved_heavy_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_chassis_1
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_heavy_three_man_tank_turret
-				suspension_type_slot = tank_torsion_bar_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-
-		allowed_modules = {
-		    tank_heavy_cannon_3
-		    tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_close_support_gun
-			tank_heavy_three_man_tank_turret
-			tank_torsion_bar_suspension
-			tank_welded_armor
-			tank_diesel_engine
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			secondary_turret_small_cannon
-			easy_maintenance
-		}
-	}
-
-	improved_heavy_tank_default = {#AMC 35
-		priority = {
-			factor = 0
-			modifier = { 
-				has_tech = advanced_heavy_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_chassis_2
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_heavy_three_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = 4
-			}
-		}
-
-		allowed_modules = {
-			tank_heavy_cannon_3
-		    tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_close_support_gun
-			tank_heavy_three_man_tank_turret
-			tank_bogie_suspension
-			tank_welded_armor
-			tank_diesel_engine
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			secondary_turret_small_cannon
-			easy_maintenance
-		}
-	}
-
-	advanced_heavy_tank_default = { #SARL42
-		priority = {
-			factor = 0
-		}
-
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_chassis_3
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_heavy_three_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = 4
-			}
-		}
-
-		allowed_modules = {
-		    tank_heavy_cannon_3
-		    tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_close_support_gun
-			tank_heavy_three_man_tank_turret
-			tank_bogie_suspension
-			tank_welded_armor
-			tank_diesel_engine
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			secondary_turret_small_cannon
-			easy_maintenance
-		}
-	}
-}
-
-BYG_heavy_tank_destroyers = {
-	category = land
-	blocked_for = {}
-	available_for = { BYG }
-	roles = {
-		land_heavy_tank_destroyer
-	}
-	priority = {
-		factor = 0
-	}
-	heavy_tank_destroyer_1 = { #Somua S35
-		priority = {
-			factor = 0
-			modifier = { 
-				has_tech = improved_heavy_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_destroyer_chassis_1
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = armor_skirts
-				special_type_slot_2 = sloped_armor
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 14
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_bogie_suspension
-		    tank_cast_armor
-			tank_diesel_engine
-			armor_skirts
-			sloped_armor
-			easy_maintenance
-		}
-	}
-	heavy_tank_destroyer_2 = {#AMC 35
-		priority = {
-			factor = 0
-			modifier = { 
-				has_tech = advanced_heavy_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_destroyer_chassis_2
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = armor_skirts
-				special_type_slot_2 = sloped_armor
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 12
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_bogie_suspension
-		    tank_cast_armor
-			tank_diesel_engine
-			armor_skirts
-			sloped_armor
-			easy_maintenance
-		}
-	}
-	heavy_tank_destroyer_3 = { #SARL42
-		priority = {
-			factor = 0
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_destroyer_chassis_3
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = armor_skirts
-				special_type_slot_2 = sloped_armor
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 12
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_bogie_suspension
-		    tank_cast_armor
-			tank_diesel_engine
-			armor_skirts
-			sloped_armor
-			easy_maintenance
-		}
-	}
-}
-
-BYG_heavy_tank_artillery = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = {BYG}
-
-	roles = {
-		land_heavy_tank_artillery
-	}
-
-	priority = {
-		factor = 0
-	}
-	heavy_tank_artillery_1 = {
-		priority = {
-			factor = 0
-			
-		}
-		enable = {
-			has_tech = interwar_artillery
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_artillery_chassis_1
-			modules = {
-				main_armament_slot = tank_medium_howitzer
-				turret_type_slot = tank_heavy_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = empty
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 4
-				tank_nsb_armor_upgrade = {
-					base = 3
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_medium_howitzer
-			tank_heavy_fixed_superstructure_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-		}
-	}
-	heavy_tank_artillery_2 = {
-		priority = {
-			factor = 0
-			
-		}
-		enable = {
-				has_tech = interwar_artillery
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 1500
-			type = heavy_tank_artillery_chassis_2
-			modules = {
-				main_armament_slot = tank_medium_howitzer_2
-				turret_type_slot = tank_heavy_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = extra_ammo_storage
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = {
-					base = 4
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_medium_howitzer_2
-			tank_heavy_fixed_superstructure_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			extra_ammo_storage
-		}
-	}
-
-	heavy_tank_artillery_3 = {
-		priority = {
-			factor = 0
-			
-		}
-		enable = {
-			has_tech = artillery5
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 2000
-			type = heavy_tank_artillery_chassis_3
-			modules = {
-				main_armament_slot = tank_heavy_howitzer
-				turret_type_slot = tank_heavy_fixed_superstructure_turret
-				suspension_type_slot = tank_interleaved_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = extra_ammo_storage
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 6
-				tank_nsb_armor_upgrade = {
-					base = 8
-					modifier = {
-						add = 4
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_heavy_howitzer
-			tank_heavy_fixed_superstructure_turret
-			tank_interleaved_suspension
-			tank_welded_armor
-			tank_gasoline_engine
-			extra_ammo_storage
-		}
-	}
-}
-
-BYG_heavy_tank_anti_air = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = {BYG}
-
-	roles = {
-		land_heavy_tank_anti_air
-	}
-
-	priority = {
-		factor = 0
-	}
-	heavy_tank_anti_air_1 = {
-		priority = {
-			factor = 1
-			
-		}
-		enable = {
-			has_tech = interwar_antiair
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_aa_chassis_1
-			modules = {
-				main_armament_slot = tank_anti_air_cannon
-				turret_type_slot = tank_heavy_two_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = empty
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 4
-				tank_nsb_armor_upgrade = {
-					base = 3
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_anti_air_cannon
-			tank_heavy_two_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-		}
-	}
-	heavy_tank_anti_air_2 = {
-		priority = {
-			factor = 0
-		}
-		enable = {
-			has_tech = antiair2
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 1500
-			type = heavy_tank_aa_chassis_2
-			modules = {
-				main_armament_slot = tank_anti_air_cannon_2
-				turret_type_slot = tank_heavy_two_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = empty
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 4
-				tank_nsb_armor_upgrade = {
-					base = 2
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_anti_air_cannon_2
-			tank_heavy_two_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-		}
-	}
-
-	heavy_tank_anti_air_3 = {
-		priority = {
-			factor = 0
-		}
-		enable = {
-			has_tech = antiair5
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 2500
-			type = heavy_tank_aa_chassis_3
-			modules = {
-				main_armament_slot = tank_anti_air_cannon_3
-				turret_type_slot = tank_heavy_two_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = empty
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = {
-					base = 3
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_anti_air_cannon_3
-			tank_heavy_two_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-		}
-	}
 }
\ No newline at end of file
diff --git a/src/common/ai_equipment/DOH_tank.txt b/src/common/ai_equipment/DOH_tank.txt
index 2b70d53..4d9e3d9 100755
--- a/src/common/ai_equipment/DOH_tank.txt
+++ b/src/common/ai_equipment/DOH_tank.txt
@@ -12,208 +12,122 @@ DOH_light_tanks = {
 	priority = {
 		factor = 1000
 	}
-	basic_light_tank_default = {
-		#Somua S35
+	basic_light_tank_default = { #Somua S35
 		priority = {
 			factor = 300
-			modifier = {
+			modifier = { 
 				has_tech = improved_light_tank_chassis
-				factor = 0				#let's not waste XP here
+				factor = 0 #let's not waste XP here
 			}
 		}
 		target_variant = {
-			match_value = 1000
+			match_value = 10000
 			type = light_tank_chassis_1
 			modules = {
-				main_armament_slot = tank_close_support_gun
-				turret_type_slot = tank_light_three_man_tank_turret
+				main_armament_slot = tank_small_cannon_2
+				turret_type_slot = tank_light_two_man_tank_turret
 				suspension_type_slot = tank_wheeled_suspension
 				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
+				engine_type_slot = tank_diesel_engine
 				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = extra_ammo_storage
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = tank_radio_1
+				special_type_slot_4 = additional_machine_guns
 			}
 			upgrades = {
-				tank_nsb_engine_upgrade = 0
+				tank_nsb_engine_upgrade = 4
 				tank_nsb_armor_upgrade = 0
 			}
 		}
 		allowed_modules = {
-			tank_heavy_machine_gun
-			tank_close_support_gun
-			tank_light_three_man_tank_turret
+			tank_small_cannon_2
+			tank_light_two_man_tank_turret
 			tank_wheeled_suspension
 			tank_riveted_armor
-			tank_gasoline_engine
+			tank_diesel_engine
 			extra_ammo_storage
 			easy_maintenance
+			tank_radio_1
+			secondary_turret_small_cannon
+			additional_machine_guns
 		}
 	}
-	improved_light_tank_default = {
-		#AMC 35
+	improved_light_tank_default = {#AMC 35
 		priority = {
 			factor = 400
-			modifier = {
+			modifier = { 
 				has_tech = advanced_light_tank_chassis
-				factor = 0				#let's not waste XP here
+				factor = 0 #let's not waste XP here
 			}
 		}
+		history = yes
 		target_variant = {
-			match_value = 1000
+			match_value = 10000
 			type = light_tank_chassis_2
 			modules = {
-				main_armament_slot = tank_close_support_gun
-				turret_type_slot = tank_light_three_man_tank_turret
+				main_armament_slot = tank_small_cannon_2
+				turret_type_slot = tank_light_two_man_tank_turret
 				suspension_type_slot = tank_wheeled_suspension
 				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
+				engine_type_slot = tank_diesel_engine
 				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = extra_ammo_storage
-				special_type_slot_3 = extra_ammo_storage
-				special_type_slot_4 = extra_ammo_storage
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = tank_radio_1
+				special_type_slot_4 = additional_machine_guns
 			}
 			upgrades = {
-				tank_nsb_engine_upgrade = 0
+				tank_nsb_engine_upgrade = 4
 				tank_nsb_armor_upgrade = 0
 			}
 		}
 		allowed_modules = {
-			tank_heavy_machine_gun
-			tank_close_support_gun
-			tank_light_three_man_tank_turret
+			tank_small_cannon_2
+			tank_light_two_man_tank_turret
 			tank_wheeled_suspension
 			tank_riveted_armor
-			tank_gasoline_engine
-			easy_maintenance
+			tank_diesel_engine
 			extra_ammo_storage
+			easy_maintenance
+			tank_radio_1
+			secondary_turret_small_cannon
+			additional_machine_guns
 		}
 	}
-	advanced_light_tank_default = {
-		#SARL42
+	advanced_light_tank_default = { #SARL42
 		priority = {
 			factor = 1000
 		}
+		history = yes
 		target_variant = {
-			match_value = 1000
+			match_value = 10000
 			type = light_tank_chassis_3
 			modules = {
-				main_armament_slot = tank_close_support_gun
-				turret_type_slot = tank_light_three_man_tank_turret
+				main_armament_slot = tank_small_cannon_2
+				turret_type_slot = tank_light_two_man_tank_turret
 				suspension_type_slot = tank_wheeled_suspension
 				armor_type_slot = tank_riveted_armor
 				engine_type_slot = tank_diesel_engine
 				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = extra_ammo_storage
-				special_type_slot_3 = extra_ammo_storage
-				special_type_slot_4 = extra_ammo_storage
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = tank_radio_1
+				special_type_slot_4 = additional_machine_guns
 			}
 			upgrades = {
-				tank_nsb_engine_upgrade = 0
+				tank_nsb_engine_upgrade = 4
 				tank_nsb_armor_upgrade = 0
 			}
 		}
 		allowed_modules = {
-			tank_heavy_machine_gun
-			tank_close_support_gun
-			tank_light_three_man_tank_turret
+			tank_small_cannon_2
+			tank_light_two_man_tank_turret
 			tank_wheeled_suspension
 			tank_riveted_armor
 			tank_diesel_engine
 			extra_ammo_storage
 			easy_maintenance
-		}
-	}
-}
-
-DOH_medium_flame_tank = {
-	category = land
-	blocked_for = {
-	}
-	available_for = {
-		DOH
-		DH1
-	}
-	roles = {
-		land_medium_tank_flamethrower
-	}
-	priority = {
-		factor = 15000
-	}
-	basic_medium_flame_tank_default = {
-		priority = {
-			factor = 10000
-			modifier = {
-				has_tech = improved_medium_tank_chassis
-				factor = 0				#let's not waste XP here
-			}
-		}
-		target_variant = {
-			match_value = 10000
-			type = medium_tank_flame_chassis
-			modules = {
-				main_armament_slot = flamethrower
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			flamethrower
-			tank_light_one_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_diesel_engine
-			easy_maintenance
-		}
-	}
-	improved_medium_flame_tank_default = {
-		priority = {
-			factor = 10000
-			modifier = {
-				NOT = {
-					has_tech = improved_medium_tank_chassis
-				}
-				factor = 0				#let's not waste XP here
-			}
-		}
-		target_variant = {
-			match_value = 10000
-			type = medium_tank_flame_chassis
-			modules = {
-				main_armament_slot = advanced_flamethrower
-				turret_type_slot = tank_light_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = extra_ammo_storage
-				special_type_slot_3 = extra_ammo_storage
-				special_type_slot_4 = extra_ammo_storage
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			advanced_flamethrower
-			tank_light_fixed_superstructure_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_diesel_engine
-			easy_maintenance
-			extra_ammo_storage
+			tank_radio_1
+			secondary_turret_small_cannon
+			additional_machine_guns
 		}
 	}
 }
@@ -430,1062 +344,3 @@ DOH_medium_tanks = {
 		}
 	}
 }
-
-DOH_medium_tank_destroyers = {
-	category = land
-	blocked_for = {
-	}
-	available_for = {
-		DOH
-		DH1
-	}
-	roles = {
-		land_medium_tank_destroyer
-	}
-	priority = {
-		factor = 3000
-	}
-	medium_tank_destroyer_1 = {
-		#Somua S35
-		priority = {
-			factor = 100
-			modifier = {
-				has_tech = improved_medium_tank_chassis
-				factor = 0				#let's not waste XP here
-			}
-		}
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_destroyer_chassis_1
-			modules = {
-				main_armament_slot = {
-					any_of = {
-						tank_heavy_cannon_3
-						tank_heavy_cannon_2
-						tank_heavy_cannon
-						tank_medium_cannon_2
-						tank_medium_cannon
-						tank_high_velocity_cannon_3
-						tank_high_velocity_cannon_2
-						tank_high_velocity_cannon
-					}
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = secondary_turret_small_cannon
-				special_type_slot_4 = extra_ammo_storage
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_christie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			secondary_turret_small_cannon
-			extra_ammo_storage
-			easy_maintenance
-		}
-	}
-	medium_tank_destroyer_2 = {
-		#AMC 35
-		priority = {
-			factor = 200
-			modifier = {
-				has_tech = advanced_medium_tank_chassis
-				factor = 0				#let's not waste XP here
-			}
-		}
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_destroyer_chassis_2
-			modules = {
-				main_armament_slot = {
-					any_of = {
-						tank_heavy_cannon_3
-						tank_heavy_cannon_2
-						tank_heavy_cannon
-						tank_medium_cannon_2
-						tank_medium_cannon
-						tank_high_velocity_cannon_3
-						tank_high_velocity_cannon_2
-						tank_high_velocity_cannon
-					}
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = secondary_turret_small_cannon
-				special_type_slot_4 = extra_ammo_storage
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			secondary_turret_small_cannon
-			extra_ammo_storage
-			easy_maintenance
-		}
-	}
-	medium_tank_destroyer_3 = {
-		#SARL42
-		priority = {
-			factor = 300
-			modifier = {
-				NOT = {
-					has_tech = advanced_medium_tank_chassis
-				}
-				factor = 0				#let's not waste XP here
-			}
-		}
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_destroyer_chassis
-			modules = {
-				main_armament_slot = {
-					any_of = {
-						tank_heavy_cannon_3
-						tank_heavy_cannon_2
-						tank_heavy_cannon
-						tank_medium_cannon_2
-						tank_medium_cannon
-						tank_high_velocity_cannon_3
-						tank_high_velocity_cannon_2
-						tank_high_velocity_cannon
-					}
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = secondary_turret_small_cannon
-				special_type_slot_4 = extra_ammo_storage
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_christie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			secondary_turret_small_cannon
-			extra_ammo_storage
-			easy_maintenance
-		}
-	}
-}
-
-DOH_medium_tank_anti_air = {
-	category = land
-	blocked_for = {
-	}
-	available_for = {
-		DOH
-		DH1
-	}
-	roles = {
-		land_medium_tank_anti_air
-	}
-	priority = {
-		factor = 500
-	}
-	medium_tank_anti_air_0 = {
-		#Somua S35
-		priority = {
-			factor = 300
-			modifier = {
-				has_tech = basic_medium_tank_chassis
-				factor = 0				#let's not waste XP here
-			}
-		}
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_aa_chassis_0
-			modules = {
-				main_armament_slot = {
-					any_of = {
-						tank_anti_air_cannon_2
-						tank_anti_air_cannon
-					}
-				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 9
-				tank_nsb_armor_upgrade = 9
-			}
-		}
-		allowed_modules = {
-			tank_anti_air_cannon_2
-			tank_anti_air_cannon
-			tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_gasoline_engine
-			tank_christie_suspension
-			sloped_armor
-			armor_skirts
-			easy_maintenance
-		}
-	}
-	medium_tank_anti_air_1 = {
-		#Somua S35
-		priority = {
-			factor = 300
-			modifier = {
-				has_tech = improved_medium_tank_chassis
-				factor = 0				#let's not waste XP here
-			}
-		}
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_aa_chassis_1
-			modules = {
-				main_armament_slot = {
-					any_of = {
-						tank_anti_air_cannon_2
-						tank_anti_air_cannon
-					}
-				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 10
-			}
-		}
-		allowed_modules = {
-			tank_anti_air_cannon_2
-			tank_anti_air_cannon
-			tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_gasoline_engine
-			tank_christie_suspension
-			sloped_armor
-			armor_skirts
-			easy_maintenance
-		}
-	}
-	medium_tank_anti_air_2 = {
-		#AMC 35
-		priority = {
-			factor = 400
-			modifier = {
-				has_tech = advanced_medium_tank_chassis
-				factor = 0				#let's not waste XP here
-			}
-		}
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_aa_chassis_2
-			modules = {
-				main_armament_slot = {
-					any_of = {
-						tank_anti_air_cannon_2
-						tank_anti_air_cannon
-					}
-				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-			tank_anti_air_cannon_2
-			tank_anti_air_cannon
-			tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_gasoline_engine
-			tank_christie_suspension
-			sloped_armor
-			armor_skirts
-			easy_maintenance
-		}
-	}
-	medium_tank_anti_air_3 = {
-		#SARL42
-		priority = {
-			factor = 1000
-			modifier = {
-				NOT = {
-					has_tech = advanced_medium_tank_chassis
-				}
-				factor = 0				#let's not waste XP here
-			}
-		}
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_aa_chassis_3
-			modules = {
-				main_armament_slot = {
-					any_of = {
-						tank_anti_air_cannon_2
-						tank_anti_air_cannon
-					}
-				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-			tank_anti_air_cannon_2
-			tank_anti_air_cannon
-			tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_gasoline_engine
-			tank_christie_suspension
-			sloped_armor
-			armor_skirts
-			easy_maintenance
-		}
-	}
-}
-
-DOH_heavy_tanks = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = { DOH }
-
-	roles = {
-		land_heavy_tank
-	}
-
-	priority = {
-		factor = 0
-	}
-	
-	basic_heavy_tank_default = { #Somua S35
-		priority = {
-			factor = 0
-			modifier = { 
-				has_tech = improved_heavy_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_chassis_1
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_heavy_three_man_tank_turret
-				suspension_type_slot = tank_torsion_bar_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-
-		allowed_modules = {
-		    tank_heavy_cannon_3
-		    tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_close_support_gun
-			tank_heavy_three_man_tank_turret
-			tank_torsion_bar_suspension
-			tank_welded_armor
-			tank_diesel_engine
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			secondary_turret_small_cannon
-			easy_maintenance
-		}
-	}
-
-	improved_heavy_tank_default = {#AMC 35
-		priority = {
-			factor = 0
-			modifier = { 
-				has_tech = advanced_heavy_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_chassis_2
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_heavy_three_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = 4
-			}
-		}
-
-		allowed_modules = {
-			tank_heavy_cannon_3
-		    tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_close_support_gun
-			tank_heavy_three_man_tank_turret
-			tank_bogie_suspension
-			tank_welded_armor
-			tank_diesel_engine
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			secondary_turret_small_cannon
-			easy_maintenance
-		}
-	}
-
-	advanced_heavy_tank_default = { #SARL42
-		priority = {
-			factor = 0
-		}
-
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_chassis_3
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_heavy_three_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = 4
-			}
-		}
-
-		allowed_modules = {
-		    tank_heavy_cannon_3
-		    tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_close_support_gun
-			tank_heavy_three_man_tank_turret
-			tank_bogie_suspension
-			tank_welded_armor
-			tank_diesel_engine
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			secondary_turret_small_cannon
-			easy_maintenance
-		}
-	}
-}
-
-DOH_heavy_tank_destroyers = {
-	category = land
-	blocked_for = {}
-	available_for = { DOH }
-	roles = {
-		land_heavy_tank_destroyer
-	}
-	priority = {
-		factor = 0
-	}
-	heavy_tank_destroyer_1 = { #Somua S35
-		priority = {
-			factor = 0
-			modifier = { 
-				has_tech = improved_heavy_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_destroyer_chassis_1
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = armor_skirts
-				special_type_slot_2 = sloped_armor
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 14
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_bogie_suspension
-		    tank_cast_armor
-			tank_diesel_engine
-			armor_skirts
-			sloped_armor
-			easy_maintenance
-		}
-	}
-	heavy_tank_destroyer_2 = {#AMC 35
-		priority = {
-			factor = 0
-			modifier = { 
-				has_tech = advanced_heavy_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_destroyer_chassis_2
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = armor_skirts
-				special_type_slot_2 = sloped_armor
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 12
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_bogie_suspension
-		    tank_cast_armor
-			tank_diesel_engine
-			armor_skirts
-			sloped_armor
-			easy_maintenance
-		}
-	}
-	heavy_tank_destroyer_3 = { #SARL42
-		priority = {
-			factor = 0
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_destroyer_chassis_3
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = armor_skirts
-				special_type_slot_2 = sloped_armor
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 12
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_bogie_suspension
-		    tank_cast_armor
-			tank_diesel_engine
-			armor_skirts
-			sloped_armor
-			easy_maintenance
-		}
-	}
-}
-
-DOH_heavy_tank_artillery = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = {DOH}
-
-	roles = {
-		land_heavy_tank_artillery
-	}
-
-	priority = {
-		factor = 0
-	}
-	heavy_tank_artillery_1 = {
-		priority = {
-			factor = 0
-			
-		}
-		enable = {
-			has_tech = interwar_artillery
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_artillery_chassis_1
-			modules = {
-				main_armament_slot = tank_medium_howitzer
-				turret_type_slot = tank_heavy_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = empty
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 4
-				tank_nsb_armor_upgrade = {
-					base = 3
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_medium_howitzer
-			tank_heavy_fixed_superstructure_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-		}
-	}
-	heavy_tank_artillery_2 = {
-		priority = {
-			factor = 0
-			
-		}
-		enable = {
-				has_tech = interwar_artillery
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 1500
-			type = heavy_tank_artillery_chassis_2
-			modules = {
-				main_armament_slot = tank_medium_howitzer_2
-				turret_type_slot = tank_heavy_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = extra_ammo_storage
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = {
-					base = 4
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_medium_howitzer_2
-			tank_heavy_fixed_superstructure_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			extra_ammo_storage
-		}
-	}
-
-	heavy_tank_artillery_3 = {
-		priority = {
-			factor = 0
-			
-		}
-		enable = {
-			has_tech = artillery5
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 2000
-			type = heavy_tank_artillery_chassis_3
-			modules = {
-				main_armament_slot = tank_heavy_howitzer
-				turret_type_slot = tank_heavy_fixed_superstructure_turret
-				suspension_type_slot = tank_interleaved_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = extra_ammo_storage
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 6
-				tank_nsb_armor_upgrade = {
-					base = 8
-					modifier = {
-						add = 4
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_heavy_howitzer
-			tank_heavy_fixed_superstructure_turret
-			tank_interleaved_suspension
-			tank_welded_armor
-			tank_gasoline_engine
-			extra_ammo_storage
-		}
-	}
-}
-
-DOH_heavy_tank_anti_air = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = {DOH}
-
-	roles = {
-		land_heavy_tank_anti_air
-	}
-
-	priority = {
-		factor = 0
-	}
-	heavy_tank_anti_air_1 = {
-		priority = {
-			factor = 1
-			
-		}
-		enable = {
-			has_tech = interwar_antiair
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_aa_chassis_1
-			modules = {
-				main_armament_slot = tank_anti_air_cannon
-				turret_type_slot = tank_heavy_two_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = empty
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 4
-				tank_nsb_armor_upgrade = {
-					base = 3
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_anti_air_cannon
-			tank_heavy_two_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-		}
-	}
-	heavy_tank_anti_air_2 = {
-		priority = {
-			factor = 0
-		}
-		enable = {
-			has_tech = antiair2
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 1500
-			type = heavy_tank_aa_chassis_2
-			modules = {
-				main_armament_slot = tank_anti_air_cannon_2
-				turret_type_slot = tank_heavy_two_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = empty
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 4
-				tank_nsb_armor_upgrade = {
-					base = 2
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_anti_air_cannon_2
-			tank_heavy_two_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-		}
-	}
-
-	heavy_tank_anti_air_3 = {
-		priority = {
-			factor = 0
-		}
-		enable = {
-			has_tech = antiair5
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 2500
-			type = heavy_tank_aa_chassis_3
-			modules = {
-				main_armament_slot = tank_anti_air_cannon_3
-				turret_type_slot = tank_heavy_two_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = empty
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = {
-					base = 3
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_anti_air_cannon_3
-			tank_heavy_two_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-		}
-	}
-}
diff --git a/src/common/ai_equipment/HUJ_tank.txt b/src/common/ai_equipment/HUJ_tank.txt
index 77a24d6..f736035 100755
--- a/src/common/ai_equipment/HUJ_tank.txt
+++ b/src/common/ai_equipment/HUJ_tank.txt
@@ -1,847 +1,3 @@
-HUJ_light_tanks = {
-	category = land
-	blocked_for = {}
-	available_for = { HUJ }
-	roles = {
-		land_light_tank
-	}
-	priority = {
-		factor = 3000
-	}
-	basic_light_tank_default = { #Somua S35
-		priority = {
-			factor = 300
-			modifier = { 
-				has_tech = improved_light_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		target_variant = {
-			match_value = 10000
-			type = light_tank_chassis_1
-			modules = {
-				main_armament_slot = tank_close_support_gun
-				turret_type_slot = tank_light_three_man_tank_turret
-				suspension_type_slot = tank_wheeled_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 9
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_heavy_machine_gun
-			tank_close_support_gun
-			tank_light_three_man_tank_turret
-			tank_wheeled_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			extra_ammo_storage
-			easy_maintenance
-		}
-	}
-	improved_light_tank_default = {#AMC 35
-		priority = {
-			factor = 400
-			modifier = { 
-				has_tech = advanced_light_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		history = yes
-		target_variant = {
-			match_value = 10000
-			type = light_tank_chassis_2
-			modules = {
-				main_armament_slot = tank_close_support_gun
-				turret_type_slot = tank_light_three_man_tank_turret
-				suspension_type_slot = tank_wheeled_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = extra_ammo_storage
-				special_type_slot_3 = extra_ammo_storage
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 8
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_heavy_machine_gun
-			tank_close_support_gun
-			tank_light_three_man_tank_turret
-			tank_wheeled_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			extra_ammo_storage
-			easy_maintenance
-		}
-	}
-	advanced_light_tank_default = { #SARL42
-		priority = {
-			factor = 1000
-		}
-		history = yes
-		target_variant = {
-			match_value = 10000
-			type = light_tank_chassis_3
-			modules = {
-				main_armament_slot = tank_close_support_gun
-				turret_type_slot = tank_light_three_man_tank_turret
-				suspension_type_slot = tank_wheeled_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = extra_ammo_storage
-				special_type_slot_3 = extra_ammo_storage
-				special_type_slot_4 = extra_ammo_storage
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_heavy_machine_gun
-			tank_close_support_gun
-			tank_light_three_man_tank_turret
-			tank_wheeled_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			extra_ammo_storage
-			easy_maintenance
-		}
-	}
-}
-
-HUJ_medium_flame_tank = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = {HUJ}
-
-	roles = {
-		land_medium_tank_flamethrower
-	}
-
-	priority = {
-		factor = 15000
-	}
-
-	basic_medium_flame_tank_default = {
-		priority = {
-			factor = 10000
-			modifier = { 
-				has_tech = improved_medium_tank_chassis 
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 10000
-			type = medium_tank_flame_chassis
-			modules = {
-				main_armament_slot = flamethrower
-				turret_type_slot = tank_light_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-
-		allowed_modules = {
-		    flamethrower
-			tank_light_fixed_superstructure_turret
-			tank_christie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			easy_maintenance
-		}
-	}
-	improved_medium_flame_tank_default = {
-		priority = {
-			factor = 10000
-			modifier = { 
-				NOT = { has_tech = improved_medium_tank_chassis }
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 10000
-			type = medium_tank_flame_chassis
-			modules = {
-				main_armament_slot = advanced_flamethrower
-				turret_type_slot = tank_light_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = extra_ammo_storage
-				special_type_slot_3 = extra_ammo_storage
-				special_type_slot_4 = extra_ammo_storage
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-
-		allowed_modules = {
-		    advanced_flamethrower
-			tank_light_fixed_superstructure_turret
-			tank_christie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			easy_maintenance
-			extra_ammo_storage
-		}
-	}
-}
-
-HUJ_medium_tanks = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = { HUJ }
-
-	roles = {
-		land_medium_tank
-	}
-
-	priority = {
-		factor = 10000
-	}
-
-	medium_tank_default = {
-		priority = {
-			factor = 100
-			modifier = { 
-				has_tech = basic_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_chassis_0
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-						tank_medium_cannon_2
-						tank_high_velocity_cannon
-						tank_medium_cannon
-						tank_small_cannon_2
-						tank_small_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_three_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = secondary_turret_small_cannon
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_small_cannon 
-			tank_small_cannon_2 
-			tank_close_support_gun 
-			tank_high_velocity_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_medium_three_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_diesel_engine
-			secondary_turret_small_cannon
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			easy_maintenance
-		}
-	}
-	
-	basic_medium_tank_default = { #Somua S35
-		priority = {
-			factor = 20
-			modifier = { 
-				has_tech = improved_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_chassis_1
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-						tank_medium_cannon_2
-						tank_high_velocity_cannon
-						tank_medium_cannon
-						tank_small_cannon_2
-						tank_small_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_three_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = easy_maintenance
-				special_type_slot_3 = secondary_turret_small_cannon
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-
-		allowed_modules = {
-			tank_small_cannon 
-			tank_small_cannon_2 
-			tank_close_support_gun 
-			tank_high_velocity_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_medium_three_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_diesel_engine
-			secondary_turret_small_cannon
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			easy_maintenance
-		}
-	}
-
-	improved_medium_tank_default = {#AMC 35
-		priority = {
-			factor = 300
-			modifier = { 
-				has_tech = advanced_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_chassis_2
-			modules = {
-				main_armament_slot = tank_medium_cannon_2
-				turret_type_slot = tank_medium_three_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = easy_maintenance
-				special_type_slot_3 = secondary_turret_small_cannon
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-
-		allowed_modules = {
-			tank_small_cannon 
-			tank_small_cannon_2 
-			tank_close_support_gun 
-			tank_high_velocity_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_medium_three_man_tank_turret
-			tank_christie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			secondary_turret_small_cannon
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			easy_maintenance
-		}
-	}
-
-	advanced_medium_tank_default = { #SARL42
-		priority = {
-			factor = 200
-			modifier = { 
-				NOT = { has_tech = advanced_medium_tank_chassis } 
-				factor = 0 #let's not waste XP here
-			}
-		}
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_chassis_3
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-						tank_medium_cannon_2
-					} 
-				}
-				turret_type_slot = tank_medium_three_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = easy_maintenance
-				special_type_slot_3 = secondary_turret_small_cannon
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 4
-				tank_nsb_armor_upgrade = 4
-			}
-		}
-
-		allowed_modules = {
-			tank_small_cannon 
-			tank_small_cannon_2 
-			tank_close_support_gun 
-			tank_high_velocity_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_medium_three_man_tank_turret
-			tank_christie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			secondary_turret_small_cannon
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			easy_maintenance
-		}
-	}
-}
-
-HUJ_medium_tank_destroyers = {
-	category = land
-	blocked_for = {}
-	available_for = { HUJ }
-	roles = {
-		land_medium_tank_destroyer
-	}
-	priority = {
-		factor = 3000
-	}
-	medium_tank_destroyer_1 = { #Somua S35
-		priority = {
-			factor = 100
-			modifier = { 
-				has_tech = improved_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_destroyer_chassis_1
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-						tank_high_velocity_cannon_3
-					    tank_heavy_cannon_3
-						tank_high_velocity_cannon_2
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-						tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = secondary_turret_small_cannon
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 10
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_christie_suspension
-		    tank_riveted_armor
-			tank_gasoline_engine
-            secondary_turret_small_cannon		
-            sloped_armor	
-			easy_maintenance
-		}
-	}
-	medium_tank_destroyer_2 = {#AMC 35
-		priority = {
-			factor = 200
-			modifier = { 
-				has_tech = advanced_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_destroyer_chassis_2
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-						tank_high_velocity_cannon_3
-					    tank_heavy_cannon_3
-						tank_high_velocity_cannon_2
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-						tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = secondary_turret_small_cannon
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = extra_ammo_storage
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-		    tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_christie_suspension
-		    tank_riveted_armor
-			tank_gasoline_engine
-            secondary_turret_small_cannon		
-            extra_ammo_storage	
-			easy_maintenance
-		}
-	}
-	medium_tank_destroyer_3 = { #SARL42
-		priority = {
-			factor = 300
-			modifier = { 
-				NOT = { has_tech = advanced_medium_tank_chassis } 
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_destroyer_chassis
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-						tank_high_velocity_cannon_3
-					    tank_heavy_cannon_3
-						tank_high_velocity_cannon_2
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-						tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = secondary_turret_small_cannon
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = extra_ammo_storage
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-		    tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_christie_suspension
-		    tank_riveted_armor
-			tank_gasoline_engine
-            secondary_turret_small_cannon		
-            extra_ammo_storage	
-			easy_maintenance
-		}
-	}
-}
-
-HUJ_medium_tank_anti_air = {
-	category = land
-	blocked_for = {}
-	available_for = { HUJ }
-	roles = {
-		land_medium_tank_anti_air
-	}
-	priority = {
-		factor = 500
-	}
-	medium_tank_anti_air_0 = { #Somua S35
-		priority = {
-			factor = 300
-			modifier = { 
-				has_tech = basic_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_aa_chassis_0
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_anti_air_cannon_2
-						tank_anti_air_cannon
-					} 
-				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 9
-				tank_nsb_armor_upgrade = 9
-			}
-		}
-		allowed_modules = {
-            tank_anti_air_cannon_2
-			tank_anti_air_cannon
-		    tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_gasoline_engine 
-			tank_christie_suspension
-			sloped_armor
-			armor_skirts
-			easy_maintenance
-		}
-	}
-	medium_tank_anti_air_1 = { #Somua S35
-		priority = {
-			factor = 300
-			modifier = { 
-				has_tech = improved_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_aa_chassis_1
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_anti_air_cannon_2
-						tank_anti_air_cannon
-					} 
-				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 14
-				tank_nsb_armor_upgrade = 10
-			}
-		}
-		allowed_modules = {
-            tank_anti_air_cannon_2
-			tank_anti_air_cannon
-		    tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_gasoline_engine 
-			tank_christie_suspension
-			sloped_armor
-			armor_skirts
-			easy_maintenance
-		}
-	}
-	medium_tank_anti_air_2 = {#AMC 35
-		priority = {
-			factor = 400
-			modifier = { 
-				has_tech = advanced_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_aa_chassis_2
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_anti_air_cannon_2
-						tank_anti_air_cannon
-					} 
-				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 15
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-		    tank_anti_air_cannon_2
-			tank_anti_air_cannon
-		    tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_gasoline_engine 
-			tank_christie_suspension
-			sloped_armor
-			armor_skirts
-			easy_maintenance
-		}
-	}
-	medium_tank_anti_air_3 = { #SARL42
-		priority = {
-			factor = 1000
-			modifier = { 
-				NOT = { has_tech = advanced_medium_tank_chassis } 
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_aa_chassis_3
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_anti_air_cannon_2
-						tank_anti_air_cannon
-					} 
-				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 15
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-		    tank_anti_air_cannon_2
-			tank_anti_air_cannon
-		    tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_gasoline_engine 
-			tank_christie_suspension
-			sloped_armor
-			armor_skirts
-			easy_maintenance
-		}
-	}
-}
-
 
 
 HUJ_medium_tank_amphibious = {
@@ -1047,676 +203,4 @@ HUJ_medium_tank_amphibious = {
 			easy_maintenance
 		}
 	}
-}
-
-HUJ_heavy_tanks = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = { HUJ }
-
-	roles = {
-		land_heavy_tank
-	}
-
-	priority = {
-		factor = 0
-	}
-	
-	basic_heavy_tank_default = { #Somua S35
-		priority = {
-			factor = 0
-			modifier = { 
-				has_tech = improved_heavy_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_chassis_1
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_heavy_three_man_tank_turret
-				suspension_type_slot = tank_torsion_bar_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-
-		allowed_modules = {
-		    tank_heavy_cannon_3
-		    tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_close_support_gun
-			tank_heavy_three_man_tank_turret
-			tank_torsion_bar_suspension
-			tank_welded_armor
-			tank_diesel_engine
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			secondary_turret_small_cannon
-			easy_maintenance
-		}
-	}
-
-	improved_heavy_tank_default = {#AMC 35
-		priority = {
-			factor = 0
-			modifier = { 
-				has_tech = advanced_heavy_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_chassis_2
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_heavy_three_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = 4
-			}
-		}
-
-		allowed_modules = {
-			tank_heavy_cannon_3
-		    tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_close_support_gun
-			tank_heavy_three_man_tank_turret
-			tank_bogie_suspension
-			tank_welded_armor
-			tank_diesel_engine
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			secondary_turret_small_cannon
-			easy_maintenance
-		}
-	}
-
-	advanced_heavy_tank_default = { #SARL42
-		priority = {
-			factor = 0
-		}
-
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_chassis_3
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_heavy_three_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = 4
-			}
-		}
-
-		allowed_modules = {
-		    tank_heavy_cannon_3
-		    tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_close_support_gun
-			tank_heavy_three_man_tank_turret
-			tank_bogie_suspension
-			tank_welded_armor
-			tank_diesel_engine
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			secondary_turret_small_cannon
-			easy_maintenance
-		}
-	}
-}
-
-HUJ_heavy_tank_destroyers = {
-	category = land
-	blocked_for = {}
-	available_for = { HUJ }
-	roles = {
-		land_heavy_tank_destroyer
-	}
-	priority = {
-		factor = 0
-	}
-	heavy_tank_destroyer_1 = { #Somua S35
-		priority = {
-			factor = 0
-			modifier = { 
-				has_tech = improved_heavy_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_destroyer_chassis_1
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = armor_skirts
-				special_type_slot_2 = sloped_armor
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 14
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_bogie_suspension
-		    tank_cast_armor
-			tank_diesel_engine
-			armor_skirts
-			sloped_armor
-			easy_maintenance
-		}
-	}
-	heavy_tank_destroyer_2 = {#AMC 35
-		priority = {
-			factor = 0
-			modifier = { 
-				has_tech = advanced_heavy_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_destroyer_chassis_2
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = armor_skirts
-				special_type_slot_2 = sloped_armor
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 12
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_bogie_suspension
-		    tank_cast_armor
-			tank_diesel_engine
-			armor_skirts
-			sloped_armor
-			easy_maintenance
-		}
-	}
-	heavy_tank_destroyer_3 = { #SARL42
-		priority = {
-			factor = 0
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_destroyer_chassis_3
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = armor_skirts
-				special_type_slot_2 = sloped_armor
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 12
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_bogie_suspension
-		    tank_cast_armor
-			tank_diesel_engine
-			armor_skirts
-			sloped_armor
-			easy_maintenance
-		}
-	}
-}
-
-HUJ_heavy_tank_artillery = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = {HUJ}
-
-	roles = {
-		land_heavy_tank_artillery
-	}
-
-	priority = {
-		factor = 0
-	}
-	heavy_tank_artillery_1 = {
-		priority = {
-			factor = 0
-			
-		}
-		enable = {
-			has_tech = interwar_artillery
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_artillery_chassis_1
-			modules = {
-				main_armament_slot = tank_medium_howitzer
-				turret_type_slot = tank_heavy_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = empty
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 4
-				tank_nsb_armor_upgrade = {
-					base = 3
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_medium_howitzer
-			tank_heavy_fixed_superstructure_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-		}
-	}
-	heavy_tank_artillery_2 = {
-		priority = {
-			factor = 0
-			
-		}
-		enable = {
-				has_tech = interwar_artillery
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 1500
-			type = heavy_tank_artillery_chassis_2
-			modules = {
-				main_armament_slot = tank_medium_howitzer_2
-				turret_type_slot = tank_heavy_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = extra_ammo_storage
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = {
-					base = 4
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_medium_howitzer_2
-			tank_heavy_fixed_superstructure_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			extra_ammo_storage
-		}
-	}
-
-	heavy_tank_artillery_3 = {
-		priority = {
-			factor = 0
-			
-		}
-		enable = {
-			has_tech = artillery5
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 2000
-			type = heavy_tank_artillery_chassis_3
-			modules = {
-				main_armament_slot = tank_heavy_howitzer
-				turret_type_slot = tank_heavy_fixed_superstructure_turret
-				suspension_type_slot = tank_interleaved_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = extra_ammo_storage
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 6
-				tank_nsb_armor_upgrade = {
-					base = 8
-					modifier = {
-						add = 4
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_heavy_howitzer
-			tank_heavy_fixed_superstructure_turret
-			tank_interleaved_suspension
-			tank_welded_armor
-			tank_gasoline_engine
-			extra_ammo_storage
-		}
-	}
-}
-
-HUJ_heavy_tank_anti_air = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = {HUJ}
-
-	roles = {
-		land_heavy_tank_anti_air
-	}
-
-	priority = {
-		factor = 0
-	}
-	heavy_tank_anti_air_1 = {
-		priority = {
-			factor = 1
-			
-		}
-		enable = {
-			has_tech = interwar_antiair
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_aa_chassis_1
-			modules = {
-				main_armament_slot = tank_anti_air_cannon
-				turret_type_slot = tank_heavy_two_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = empty
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 4
-				tank_nsb_armor_upgrade = {
-					base = 3
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_anti_air_cannon
-			tank_heavy_two_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-		}
-	}
-	heavy_tank_anti_air_2 = {
-		priority = {
-			factor = 0
-		}
-		enable = {
-			has_tech = antiair2
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 1500
-			type = heavy_tank_aa_chassis_2
-			modules = {
-				main_armament_slot = tank_anti_air_cannon_2
-				turret_type_slot = tank_heavy_two_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = empty
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 4
-				tank_nsb_armor_upgrade = {
-					base = 2
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_anti_air_cannon_2
-			tank_heavy_two_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-		}
-	}
-
-	heavy_tank_anti_air_3 = {
-		priority = {
-			factor = 0
-		}
-		enable = {
-			has_tech = antiair5
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 2500
-			type = heavy_tank_aa_chassis_3
-			modules = {
-				main_armament_slot = tank_anti_air_cannon_3
-				turret_type_slot = tank_heavy_two_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = empty
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = {
-					base = 3
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_anti_air_cannon_3
-			tank_heavy_two_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-		}
-	}
 }
\ No newline at end of file
diff --git a/src/common/ai_equipment/SAD_tank.txt b/src/common/ai_equipment/SAD_tank.txt
index 7b5ab70..48b4df7 100755
--- a/src/common/ai_equipment/SAD_tank.txt
+++ b/src/common/ai_equipment/SAD_tank.txt
@@ -1,6 +1,6 @@
 SAD_light_tanks = {
 	category = land
-	blocked_for = {}
+	blocked_for = { TIX YUW HUJ BYG BFL BYG WEX DOH DH1 CHY }
 	available_for = { SAD }
 	roles = {
 		land_light_tank
@@ -189,525 +189,6 @@ SAD_light_tanks = {
 	}
 }
 
-SAD_medium_tanks = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = { SAD }
-
-	roles = {
-		land_medium_tank
-	}
-
-	priority = {
-		factor = 10000
-	}
-
-	medium_tank_default = {
-		priority = {
-			factor = 1000
-			modifier = { 
-				has_tech = basic_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_chassis_0
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-						tank_medium_cannon_2
-						tank_high_velocity_cannon
-						tank_medium_cannon
-						tank_small_cannon_2
-						tank_small_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_three_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = secondary_turret_small_cannon
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_small_cannon 
-			tank_small_cannon_2 
-			tank_close_support_gun 
-			tank_high_velocity_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_medium_three_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_diesel_engine
-			secondary_turret_small_cannon
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			easy_maintenance
-		}
-	}
-	
-	basic_medium_tank_default = { #Somua S35
-		priority = {
-			factor = 2000
-			modifier = { 
-				has_tech = improved_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_chassis_1
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-						tank_medium_cannon_2
-						tank_high_velocity_cannon
-						tank_medium_cannon
-						tank_small_cannon_2
-						tank_small_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_three_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = easy_maintenance
-				special_type_slot_3 = secondary_turret_small_cannon
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-
-		allowed_modules = {
-			tank_small_cannon 
-			tank_small_cannon_2 
-			tank_close_support_gun 
-			tank_high_velocity_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_medium_three_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_diesel_engine
-			secondary_turret_small_cannon
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			easy_maintenance
-		}
-	}
-
-	improved_medium_tank_default = {#AMC 35
-		priority = {
-			factor = 3000
-			modifier = { 
-				has_tech = advanced_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_chassis_2
-			modules = {
-				main_armament_slot = tank_medium_cannon_2
-				turret_type_slot = tank_medium_three_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = easy_maintenance
-				special_type_slot_3 = secondary_turret_small_cannon
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-
-		allowed_modules = {
-			tank_small_cannon 
-			tank_small_cannon_2 
-			tank_close_support_gun 
-			tank_high_velocity_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_medium_three_man_tank_turret
-			tank_christie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			secondary_turret_small_cannon
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			easy_maintenance
-		}
-	}
-
-	advanced_medium_tank_default = { #SARL42
-		priority = {
-			factor = 4000
-		}
-
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_chassis_3
-			modules = {
-				main_armament_slot = tank_medium_cannon_2
-				turret_type_slot = tank_medium_three_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = easy_maintenance
-				special_type_slot_3 = secondary_turret_small_cannon
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-
-		allowed_modules = {
-			tank_small_cannon 
-			tank_small_cannon_2 
-			tank_close_support_gun 
-			tank_high_velocity_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_medium_three_man_tank_turret
-			tank_christie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			secondary_turret_small_cannon
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			easy_maintenance
-		}
-	}
-}
-
-SAD_medium_tank_destroyers = {
-	category = land
-	blocked_for = {}
-	available_for = { SAD }
-	roles = {
-		land_medium_tank_destroyer
-	}
-	priority = {
-		factor = 500
-	}
-	medium_tank_destroyer_1 = { #Somua S35
-		priority = {
-			factor = 300
-			modifier = { 
-				has_tech = improved_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_destroyer_chassis_1
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-						tank_high_velocity_cannon_3
-					    tank_heavy_cannon_3
-						tank_high_velocity_cannon_2
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-						tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = secondary_turret_small_cannon
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 10
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_christie_suspension
-		    tank_riveted_armor
-			tank_gasoline_engine
-            secondary_turret_small_cannon		
-            sloped_armor	
-			easy_maintenance
-		}
-	}
-	medium_tank_destroyer_2 = {#AMC 35
-		priority = {
-			factor = 400
-			modifier = { 
-				has_tech = advanced_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_destroyer_chassis_2
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-						tank_high_velocity_cannon_3
-					    tank_heavy_cannon_3
-						tank_high_velocity_cannon_2
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-						tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = secondary_turret_small_cannon
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = extra_ammo_storage
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-		    tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_christie_suspension
-		    tank_riveted_armor
-			tank_gasoline_engine
-            secondary_turret_small_cannon		
-            extra_ammo_storage	
-			easy_maintenance
-		}
-	}
-	medium_tank_destroyer_3 = { #SARL42
-		priority = {
-			factor = 500
-			modifier = { 
-				NOT = { has_tech = advanced_medium_tank_chassis } 
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_destroyer_chassis
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-						tank_high_velocity_cannon_3
-					    tank_heavy_cannon_3
-						tank_high_velocity_cannon_2
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-						tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = secondary_turret_small_cannon
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = extra_ammo_storage
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-		    tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_christie_suspension
-		    tank_riveted_armor
-			tank_gasoline_engine
-            secondary_turret_small_cannon		
-            extra_ammo_storage	
-			easy_maintenance
-		}
-	}
-}
-
-SAD_medium_flame_tank = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = {SAD}
-
-	roles = {
-		land_medium_tank_flamethrower
-	}
-
-	priority = {
-		factor = 15000
-	}
-
-	basic_medium_flame_tank_default = {
-		priority = {
-			factor = 10000
-			modifier = { 
-				has_tech = improved_medium_tank_chassis 
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 10000
-			type = medium_tank_flame_chassis
-			modules = {
-				main_armament_slot = flamethrower
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-
-		allowed_modules = {
-		    flamethrower
-			tank_light_one_man_tank_turret
-			tank_christie_suspension
-			tank_riveted_armor
-			tank_diesel_engine
-			easy_maintenance
-		}
-	}
-	improved_medium_flame_tank_default = {
-		priority = {
-			factor = 10000
-			modifier = { 
-				NOT = { has_tech = improved_medium_tank_chassis }
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 10000
-			type = medium_tank_flame_chassis
-			modules = {
-				main_armament_slot = advanced_flamethrower
-				turret_type_slot = tank_light_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = extra_ammo_storage
-				special_type_slot_3 = extra_ammo_storage
-				special_type_slot_4 = extra_ammo_storage
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-
-		allowed_modules = {
-		    advanced_flamethrower
-			tank_light_fixed_superstructure_turret
-			tank_christie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			easy_maintenance
-			extra_ammo_storage
-		}
-	}
-}
 SAD_light_tank_destroyers = {
 	category = land
 	blocked_for = {}
@@ -1028,864 +509,4 @@ SAD_light_tank_artillery = {
 			easy_maintenance
 		}
 	}
-}
-
-SAD_medium_tank_anti_air = {
-	category = land
-	blocked_for = {}
-	available_for = { SAD }
-	roles = {
-		land_medium_tank_anti_air
-	}
-	priority = {
-		factor = 500
-	}
-	medium_tank_anti_air_0 = { #Somua S35
-		priority = {
-			factor = 300
-			modifier = { 
-				has_tech = basic_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_aa_chassis_0
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_anti_air_cannon_2
-						tank_anti_air_cannon
-					} 
-				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 9
-				tank_nsb_armor_upgrade = 9
-			}
-		}
-		allowed_modules = {
-            tank_anti_air_cannon_2
-			tank_anti_air_cannon
-		    tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_gasoline_engine 
-			tank_christie_suspension
-			sloped_armor
-			armor_skirts
-			easy_maintenance
-		}
-	}
-	medium_tank_anti_air_1 = { #Somua S35
-		priority = {
-			factor = 300
-			modifier = { 
-				has_tech = improved_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_aa_chassis_1
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_anti_air_cannon_2
-						tank_anti_air_cannon
-					} 
-				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 14
-				tank_nsb_armor_upgrade = 10
-			}
-		}
-		allowed_modules = {
-            tank_anti_air_cannon_2
-			tank_anti_air_cannon
-		    tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_gasoline_engine 
-			tank_christie_suspension
-			sloped_armor
-			armor_skirts
-			easy_maintenance
-		}
-	}
-	medium_tank_anti_air_2 = {#AMC 35
-		priority = {
-			factor = 400
-			modifier = { 
-				has_tech = advanced_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_aa_chassis_2
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_anti_air_cannon_2
-						tank_anti_air_cannon
-					} 
-				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 15
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-		    tank_anti_air_cannon_2
-			tank_anti_air_cannon
-		    tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_gasoline_engine 
-			tank_christie_suspension
-			sloped_armor
-			armor_skirts
-			easy_maintenance
-		}
-	}
-	medium_tank_anti_air_3 = { #SARL42
-		priority = {
-			factor = 1000
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_aa_chassis_3
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_anti_air_cannon_2
-						tank_anti_air_cannon
-					} 
-				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 15
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-		    tank_anti_air_cannon_2
-			tank_anti_air_cannon
-		    tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_gasoline_engine 
-			tank_christie_suspension
-			sloped_armor
-			armor_skirts
-			easy_maintenance
-		}
-	}
-}
-
-SAD_heavy_tanks = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = { SAD }
-
-	roles = {
-		land_heavy_tank
-	}
-
-	priority = {
-		factor = 0
-	}
-	
-	basic_heavy_tank_default = { #Somua S35
-		priority = {
-			factor = 0
-			modifier = { 
-				has_tech = improved_heavy_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_chassis_1
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_heavy_three_man_tank_turret
-				suspension_type_slot = tank_torsion_bar_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-
-		allowed_modules = {
-		    tank_heavy_cannon_3
-		    tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_close_support_gun
-			tank_heavy_three_man_tank_turret
-			tank_torsion_bar_suspension
-			tank_welded_armor
-			tank_diesel_engine
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			secondary_turret_small_cannon
-			easy_maintenance
-		}
-	}
-
-	improved_heavy_tank_default = {#AMC 35
-		priority = {
-			factor = 0
-			modifier = { 
-				has_tech = advanced_heavy_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_chassis_2
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_heavy_three_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = 4
-			}
-		}
-
-		allowed_modules = {
-			tank_heavy_cannon_3
-		    tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_close_support_gun
-			tank_heavy_three_man_tank_turret
-			tank_bogie_suspension
-			tank_welded_armor
-			tank_diesel_engine
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			secondary_turret_small_cannon
-			easy_maintenance
-		}
-	}
-
-	advanced_heavy_tank_default = { #SARL42
-		priority = {
-			factor = 0
-		}
-
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_chassis_3
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_heavy_three_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = 4
-			}
-		}
-
-		allowed_modules = {
-		    tank_heavy_cannon_3
-		    tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_close_support_gun
-			tank_heavy_three_man_tank_turret
-			tank_bogie_suspension
-			tank_welded_armor
-			tank_diesel_engine
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			secondary_turret_small_cannon
-			easy_maintenance
-		}
-	}
-}
-
-SAD_heavy_tank_destroyers = {
-	category = land
-	blocked_for = {}
-	available_for = { SAD }
-	roles = {
-		land_heavy_tank_destroyer
-	}
-	priority = {
-		factor = 0
-	}
-	heavy_tank_destroyer_1 = { #Somua S35
-		priority = {
-			factor = 0
-			modifier = { 
-				has_tech = improved_heavy_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_destroyer_chassis_1
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = armor_skirts
-				special_type_slot_2 = sloped_armor
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 14
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_bogie_suspension
-		    tank_cast_armor
-			tank_diesel_engine
-			armor_skirts
-			sloped_armor
-			easy_maintenance
-		}
-	}
-	heavy_tank_destroyer_2 = {#AMC 35
-		priority = {
-			factor = 0
-			modifier = { 
-				has_tech = advanced_heavy_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_destroyer_chassis_2
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = armor_skirts
-				special_type_slot_2 = sloped_armor
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 12
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_bogie_suspension
-		    tank_cast_armor
-			tank_diesel_engine
-			armor_skirts
-			sloped_armor
-			easy_maintenance
-		}
-	}
-	heavy_tank_destroyer_3 = { #SARL42
-		priority = {
-			factor = 0
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_destroyer_chassis_3
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = armor_skirts
-				special_type_slot_2 = sloped_armor
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 12
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_bogie_suspension
-		    tank_cast_armor
-			tank_diesel_engine
-			armor_skirts
-			sloped_armor
-			easy_maintenance
-		}
-	}
-}
-
-SAD_heavy_tank_artillery = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = {SAD}
-
-	roles = {
-		land_heavy_tank_artillery
-	}
-
-	priority = {
-		factor = 0
-	}
-	heavy_tank_artillery_1 = {
-		priority = {
-			factor = 0
-			
-		}
-		enable = {
-			has_tech = interwar_artillery
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_artillery_chassis_1
-			modules = {
-				main_armament_slot = tank_medium_howitzer
-				turret_type_slot = tank_heavy_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = empty
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 4
-				tank_nsb_armor_upgrade = {
-					base = 3
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_medium_howitzer
-			tank_heavy_fixed_superstructure_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-		}
-	}
-	heavy_tank_artillery_2 = {
-		priority = {
-			factor = 0
-			
-		}
-		enable = {
-				has_tech = interwar_artillery
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 1500
-			type = heavy_tank_artillery_chassis_2
-			modules = {
-				main_armament_slot = tank_medium_howitzer_2
-				turret_type_slot = tank_heavy_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = extra_ammo_storage
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = {
-					base = 4
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_medium_howitzer_2
-			tank_heavy_fixed_superstructure_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			extra_ammo_storage
-		}
-	}
-
-	heavy_tank_artillery_3 = {
-		priority = {
-			factor = 0
-			
-		}
-		enable = {
-			has_tech = artillery5
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 2000
-			type = heavy_tank_artillery_chassis_3
-			modules = {
-				main_armament_slot = tank_heavy_howitzer
-				turret_type_slot = tank_heavy_fixed_superstructure_turret
-				suspension_type_slot = tank_interleaved_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = extra_ammo_storage
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 6
-				tank_nsb_armor_upgrade = {
-					base = 8
-					modifier = {
-						add = 4
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_heavy_howitzer
-			tank_heavy_fixed_superstructure_turret
-			tank_interleaved_suspension
-			tank_welded_armor
-			tank_gasoline_engine
-			extra_ammo_storage
-		}
-	}
-}
-
-SAD_heavy_tank_anti_air = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = {SAD}
-
-	roles = {
-		land_heavy_tank_anti_air
-	}
-
-	priority = {
-		factor = 0
-	}
-	heavy_tank_anti_air_1 = {
-		priority = {
-			factor = 1
-			
-		}
-		enable = {
-			has_tech = interwar_antiair
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_aa_chassis_1
-			modules = {
-				main_armament_slot = tank_anti_air_cannon
-				turret_type_slot = tank_heavy_two_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = empty
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 4
-				tank_nsb_armor_upgrade = {
-					base = 3
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_anti_air_cannon
-			tank_heavy_two_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-		}
-	}
-	heavy_tank_anti_air_2 = {
-		priority = {
-			factor = 0
-		}
-		enable = {
-			has_tech = antiair2
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 1500
-			type = heavy_tank_aa_chassis_2
-			modules = {
-				main_armament_slot = tank_anti_air_cannon_2
-				turret_type_slot = tank_heavy_two_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = empty
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 4
-				tank_nsb_armor_upgrade = {
-					base = 2
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_anti_air_cannon_2
-			tank_heavy_two_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-		}
-	}
-
-	heavy_tank_anti_air_3 = {
-		priority = {
-			factor = 0
-		}
-		enable = {
-			has_tech = antiair5
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 2500
-			type = heavy_tank_aa_chassis_3
-			modules = {
-				main_armament_slot = tank_anti_air_cannon_3
-				turret_type_slot = tank_heavy_two_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = empty
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = {
-					base = 3
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_anti_air_cannon_3
-			tank_heavy_two_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-		}
-	}
 }
\ No newline at end of file
diff --git a/src/common/ai_equipment/SIR_tank.txt b/src/common/ai_equipment/SIR_tank.txt
index 1331a46..995fb18 100755
--- a/src/common/ai_equipment/SIR_tank.txt
+++ b/src/common/ai_equipment/SIR_tank.txt
@@ -1,7 +1,7 @@
 SIR_heavy_tanks = {
 	category = land
 
-	blocked_for = {}
+	blocked_for = { TIX SAD YUW HUJ BYG BFL BYG WEX DOH DH1 }
 
 	available_for = { SIR }
 
@@ -201,7 +201,7 @@ SIR_heavy_tanks = {
 
 SIR_heavy_tank_destroyers = {
 	category = land
-	blocked_for = {}
+	blocked_for = { TIX SAD YUW HUJ BYG BFL BYG WEX DOH DH1 }
 	available_for = { SIR }
 	roles = {
 		land_heavy_tank_destroyer
@@ -374,7 +374,7 @@ SIR_heavy_tank_destroyers = {
 SIR_medium_flame_tank = {
 	category = land
 
-	blocked_for = {}
+	blocked_for = { TIX SAD YUW HUJ BYG BFL BYG WEX DOH DH1 }
 
 	available_for = {SIR}
 
@@ -424,7 +424,7 @@ SIR_medium_flame_tank = {
 
 SIR_light_tanks = {
 	category = land
-	blocked_for = {}
+	blocked_for = { TIX SAD YUW HUJ BYG BFL BYG WEX DOH DH1 }
 	available_for = { SIR }
 	roles = {
 		land_light_tank
diff --git a/src/common/ai_equipment/TIX_tank.txt b/src/common/ai_equipment/TIX_tank.txt
index d6caee6..b86cfc8 100755
--- a/src/common/ai_equipment/TIX_tank.txt
+++ b/src/common/ai_equipment/TIX_tank.txt
@@ -1,7 +1,7 @@
 TIX_light_tanks = {
 	category = land
-	blocked_for = {}
-	available_for = { TIX }
+	blocked_for = { SAD }
+	available_for = { TIX YUW HUJ BYG BFL BYG WEX }
 	roles = {
 		land_light_tank
 	}
@@ -20,30 +20,32 @@ TIX_light_tanks = {
 			match_value = 10000
 			type = light_tank_chassis_1
 			modules = {
-				main_armament_slot = tank_close_support_gun
-				turret_type_slot = tank_light_three_man_tank_turret
+				main_armament_slot = tank_small_cannon_2
+				turret_type_slot = tank_light_two_man_tank_turret
 				suspension_type_slot = tank_wheeled_suspension
 				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
+				engine_type_slot = tank_diesel_engine
 				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = tank_radio_1
+				special_type_slot_4 = additional_machine_guns
 			}
 			upgrades = {
-				tank_nsb_engine_upgrade = 9
+				tank_nsb_engine_upgrade = 4
 				tank_nsb_armor_upgrade = 0
 			}
 		}
 		allowed_modules = {
-			tank_heavy_machine_gun
-			tank_close_support_gun
-			tank_light_three_man_tank_turret
+			tank_small_cannon_2
+			tank_light_two_man_tank_turret
 			tank_wheeled_suspension
 			tank_riveted_armor
-			tank_gasoline_engine
+			tank_diesel_engine
 			extra_ammo_storage
 			easy_maintenance
+			tank_radio_1
+			secondary_turret_small_cannon
+			additional_machine_guns
 		}
 	}
 	improved_light_tank_default = {#AMC 35
@@ -59,30 +61,32 @@ TIX_light_tanks = {
 			match_value = 10000
 			type = light_tank_chassis_2
 			modules = {
-				main_armament_slot = tank_close_support_gun
-				turret_type_slot = tank_light_three_man_tank_turret
+				main_armament_slot = tank_small_cannon_2
+				turret_type_slot = tank_light_two_man_tank_turret
 				suspension_type_slot = tank_wheeled_suspension
 				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
+				engine_type_slot = tank_diesel_engine
 				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = extra_ammo_storage
-				special_type_slot_3 = extra_ammo_storage
-				special_type_slot_4 = empty
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = tank_radio_1
+				special_type_slot_4 = additional_machine_guns
 			}
 			upgrades = {
-				tank_nsb_engine_upgrade = 8
+				tank_nsb_engine_upgrade = 4
 				tank_nsb_armor_upgrade = 0
 			}
 		}
 		allowed_modules = {
-			tank_heavy_machine_gun
-			tank_close_support_gun
-			tank_light_three_man_tank_turret
+			tank_small_cannon_2
+			tank_light_two_man_tank_turret
 			tank_wheeled_suspension
 			tank_riveted_armor
-			tank_gasoline_engine
+			tank_diesel_engine
 			extra_ammo_storage
 			easy_maintenance
+			tank_radio_1
+			secondary_turret_small_cannon
+			additional_machine_guns
 		}
 	}
 	advanced_light_tank_default = { #SARL42
@@ -94,30 +98,32 @@ TIX_light_tanks = {
 			match_value = 10000
 			type = light_tank_chassis_3
 			modules = {
-				main_armament_slot = tank_close_support_gun
-				turret_type_slot = tank_light_three_man_tank_turret
+				main_armament_slot = tank_small_cannon_2
+				turret_type_slot = tank_light_two_man_tank_turret
 				suspension_type_slot = tank_wheeled_suspension
 				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
+				engine_type_slot = tank_diesel_engine
 				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = extra_ammo_storage
-				special_type_slot_3 = extra_ammo_storage
-				special_type_slot_4 = extra_ammo_storage
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = tank_radio_1
+				special_type_slot_4 = additional_machine_guns
 			}
 			upgrades = {
-				tank_nsb_engine_upgrade = 0
+				tank_nsb_engine_upgrade = 4
 				tank_nsb_armor_upgrade = 0
 			}
 		}
 		allowed_modules = {
-			tank_heavy_machine_gun
-			tank_close_support_gun
-			tank_light_three_man_tank_turret
+			tank_small_cannon_2
+			tank_light_two_man_tank_turret
 			tank_wheeled_suspension
 			tank_riveted_armor
-			tank_gasoline_engine
+			tank_diesel_engine
 			extra_ammo_storage
 			easy_maintenance
+			tank_radio_1
+			secondary_turret_small_cannon
+			additional_machine_guns
 		}
 	}
 }
@@ -127,7 +133,7 @@ TIX_medium_flame_tank = {
 
 	blocked_for = {}
 
-	available_for = {TIX}
+	available_for = { TIX SAD YUW HUJ BYG BFL BYG WEX DOH DH1 }
 
 	roles = {
 		land_medium_tank_flamethrower
@@ -151,8 +157,8 @@ TIX_medium_flame_tank = {
 			type = medium_tank_flame_chassis
 			modules = {
 				main_armament_slot = flamethrower
-				turret_type_slot = tank_light_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
+				turret_type_slot = tank_medium_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
 				armor_type_slot = tank_riveted_armor
 				engine_type_slot = tank_gasoline_engine
 				special_type_slot_1 = easy_maintenance
@@ -168,8 +174,8 @@ TIX_medium_flame_tank = {
 
 		allowed_modules = {
 		    flamethrower
-			tank_light_fixed_superstructure_turret
-			tank_christie_suspension
+			tank_medium_two_man_tank_turret
+			tank_bogie_suspension
 			tank_riveted_armor
 			tank_gasoline_engine
 			easy_maintenance
@@ -189,14 +195,14 @@ TIX_medium_flame_tank = {
 			type = medium_tank_flame_chassis
 			modules = {
 				main_armament_slot = advanced_flamethrower
-				turret_type_slot = tank_light_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
+				turret_type_slot = tank_medium_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
 				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
+				engine_type_slot = tank_diesel_engine
 				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = extra_ammo_storage
-				special_type_slot_3 = extra_ammo_storage
-				special_type_slot_4 = extra_ammo_storage
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
 			}
 			upgrades = {
 				tank_nsb_engine_upgrade = 0
@@ -206,12 +212,11 @@ TIX_medium_flame_tank = {
 
 		allowed_modules = {
 		    advanced_flamethrower
-			tank_light_fixed_superstructure_turret
-			tank_christie_suspension
+			tank_medium_two_man_tank_turret
+			tank_bogie_suspension
 			tank_riveted_armor
-			tank_gasoline_engine
+			tank_diesel_engine
 			easy_maintenance
-			extra_ammo_storage
 		}
 	}
 }
@@ -219,7 +224,7 @@ TIX_medium_flame_tank = {
 TIX_medium_tank_destroyers = {
 	category = land
 	blocked_for = {}
-	available_for = { TIX }
+	available_for = { TIX SAD YUW HUJ BYG BFL BYG WEX DOH DH1 }
 	roles = {
 		land_medium_tank_destroyer
 	}
@@ -252,16 +257,16 @@ TIX_medium_tank_destroyers = {
 					} 
 				}
 				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
+				suspension_type_slot = tank_bogie_suspension
 				armor_type_slot = tank_riveted_armor
 				engine_type_slot = tank_gasoline_engine
 				special_type_slot_1 = secondary_turret_small_cannon
 				special_type_slot_2 = secondary_turret_small_cannon
 				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
+				special_type_slot_4 = additional_machine_guns
 			}
 			upgrades = {
-				tank_nsb_engine_upgrade = 10
+				tank_nsb_engine_upgrade = 0
 				tank_nsb_armor_upgrade = 0
 			}
 		}
@@ -275,12 +280,13 @@ TIX_medium_tank_destroyers = {
 			tank_high_velocity_cannon_2
 			tank_high_velocity_cannon
 			tank_medium_fixed_superstructure_turret
-			tank_christie_suspension
+			tank_bogie_suspension
 		    tank_riveted_armor
 			tank_gasoline_engine
             secondary_turret_small_cannon		
             sloped_armor	
 			easy_maintenance
+			additional_machine_guns
 		}
 	}
 	medium_tank_destroyer_2 = {#AMC 35
@@ -309,13 +315,13 @@ TIX_medium_tank_destroyers = {
 					} 
 				}
 				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
+				suspension_type_slot = tank_bogie_suspension
 				armor_type_slot = tank_riveted_armor
 				engine_type_slot = tank_gasoline_engine
 				special_type_slot_1 = secondary_turret_small_cannon
 				special_type_slot_2 = secondary_turret_small_cannon
 				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = extra_ammo_storage
+				special_type_slot_4 = additional_machine_guns
 			}
 			upgrades = {
 				tank_nsb_engine_upgrade = 0
@@ -332,11 +338,11 @@ TIX_medium_tank_destroyers = {
 			tank_high_velocity_cannon_2
 			tank_high_velocity_cannon
 			tank_medium_fixed_superstructure_turret
-			tank_christie_suspension
+			tank_bogie_suspension
 		    tank_riveted_armor
 			tank_gasoline_engine
             secondary_turret_small_cannon		
-            extra_ammo_storage	
+            additional_machine_guns	
 			easy_maintenance
 		}
 	}
@@ -366,13 +372,13 @@ TIX_medium_tank_destroyers = {
 					} 
 				}
 				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
+				suspension_type_slot = tank_bogie_suspension
 				armor_type_slot = tank_riveted_armor
 				engine_type_slot = tank_gasoline_engine
 				special_type_slot_1 = secondary_turret_small_cannon
 				special_type_slot_2 = secondary_turret_small_cannon
 				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = extra_ammo_storage
+				special_type_slot_4 = additional_machine_guns
 			}
 			upgrades = {
 				tank_nsb_engine_upgrade = 0
@@ -389,11 +395,11 @@ TIX_medium_tank_destroyers = {
 			tank_high_velocity_cannon_2
 			tank_high_velocity_cannon
 			tank_medium_fixed_superstructure_turret
-			tank_christie_suspension
+			tank_bogie_suspension
 		    tank_riveted_armor
 			tank_gasoline_engine
             secondary_turret_small_cannon		
-            extra_ammo_storage	
+            additional_machine_guns	
 			easy_maintenance
 		}
 	}
@@ -404,7 +410,7 @@ TIX_medium_tanks = {
 
 	blocked_for = {}
 
-	available_for = { TIX }
+	available_for = { TIX SAD }
 
 	roles = {
 		land_medium_tank
@@ -506,7 +512,7 @@ TIX_medium_tanks = {
 			}
 			upgrades = {
 				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
+				tank_nsb_armor_upgrade = 4
 			}
 		}
 
@@ -544,7 +550,7 @@ TIX_medium_tanks = {
 			modules = {
 				main_armament_slot = tank_medium_cannon_2
 				turret_type_slot = tank_medium_three_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
+				suspension_type_slot = tank_bogie_suspension
 				armor_type_slot = tank_riveted_armor
 				engine_type_slot = tank_gasoline_engine
 				special_type_slot_1 = {
@@ -560,7 +566,7 @@ TIX_medium_tanks = {
 			}
 			upgrades = {
 				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
+				tank_nsb_armor_upgrade = 4
 			}
 		}
 
@@ -572,7 +578,7 @@ TIX_medium_tanks = {
 			tank_medium_cannon_2
 			tank_medium_cannon
 			tank_medium_three_man_tank_turret
-			tank_christie_suspension
+			tank_bogie_suspension
 			tank_riveted_armor
 			tank_gasoline_engine
 			secondary_turret_small_cannon
@@ -618,7 +624,7 @@ TIX_medium_tanks = {
 			}
 			upgrades = {
 				tank_nsb_engine_upgrade = 4
-				tank_nsb_armor_upgrade = 4
+				tank_nsb_armor_upgrade = 9
 			}
 		}
 
@@ -645,7 +651,7 @@ TIX_medium_tanks = {
 TIX_medium_tank_anti_air = {
 	category = land
 	blocked_for = {}
-	available_for = { TIX }
+	available_for = { TIX SAD YUW HUJ BYG BFL BYG WEX DOH DH1 }
 	roles = {
 		land_medium_tank_anti_air
 	}
@@ -671,29 +677,31 @@ TIX_medium_tank_anti_air = {
 						tank_anti_air_cannon
 					} 
 				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
+				turret_type_slot = tank_medium_three_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_1
+				special_type_slot_2 = easy_maintenance
+				special_type_slot_3 = secondary_turret_small_cannon
+				special_type_slot_4 = secondary_turret_small_cannon
 			}
 			upgrades = {
-				tank_nsb_engine_upgrade = 9
-				tank_nsb_armor_upgrade = 9
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = 4
 			}
 		}
 		allowed_modules = {
             tank_anti_air_cannon_2
 			tank_anti_air_cannon
-		    tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_gasoline_engine 
-			tank_christie_suspension
-			sloped_armor
-			armor_skirts
+		    tank_riveted_armor
+			tank_medium_three_man_tank_turret
+			tank_bogie_suspension 
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			tank_diesel_engine
 			easy_maintenance
 		}
 	}
@@ -716,29 +724,31 @@ TIX_medium_tank_anti_air = {
 						tank_anti_air_cannon
 					} 
 				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
+				turret_type_slot = tank_medium_three_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_1
+				special_type_slot_2 = easy_maintenance
+				special_type_slot_3 = secondary_turret_small_cannon
+				special_type_slot_4 = secondary_turret_small_cannon
 			}
 			upgrades = {
-				tank_nsb_engine_upgrade = 14
-				tank_nsb_armor_upgrade = 10
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = 4
 			}
 		}
 		allowed_modules = {
             tank_anti_air_cannon_2
 			tank_anti_air_cannon
-		    tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_gasoline_engine 
-			tank_christie_suspension
-			sloped_armor
-			armor_skirts
+		    tank_riveted_armor
+			tank_medium_three_man_tank_turret
+			tank_bogie_suspension 
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			tank_diesel_engine
 			easy_maintenance
 		}
 	}
@@ -761,29 +771,31 @@ TIX_medium_tank_anti_air = {
 						tank_anti_air_cannon
 					} 
 				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
+				turret_type_slot = tank_medium_three_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_1
+				special_type_slot_2 = easy_maintenance
+				special_type_slot_3 = secondary_turret_small_cannon
+				special_type_slot_4 = secondary_turret_small_cannon
 			}
 			upgrades = {
-				tank_nsb_engine_upgrade = 15
-				tank_nsb_armor_upgrade = 20
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = 4
 			}
 		}
 		allowed_modules = {
-		    tank_anti_air_cannon_2
+            tank_anti_air_cannon_2
 			tank_anti_air_cannon
-		    tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_gasoline_engine 
-			tank_christie_suspension
-			sloped_armor
-			armor_skirts
+		    tank_riveted_armor
+			tank_medium_three_man_tank_turret
+			tank_bogie_suspension 
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			tank_diesel_engine
 			easy_maintenance
 		}
 	}
@@ -806,29 +818,31 @@ TIX_medium_tank_anti_air = {
 						tank_anti_air_cannon
 					} 
 				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
+				turret_type_slot = tank_medium_three_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_1
+				special_type_slot_2 = easy_maintenance
+				special_type_slot_3 = secondary_turret_small_cannon
+				special_type_slot_4 = secondary_turret_small_cannon
 			}
 			upgrades = {
-				tank_nsb_engine_upgrade = 15
-				tank_nsb_armor_upgrade = 20
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = 4
 			}
 		}
 		allowed_modules = {
-		    tank_anti_air_cannon_2
+            tank_anti_air_cannon_2
 			tank_anti_air_cannon
-		    tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_gasoline_engine 
-			tank_christie_suspension
-			sloped_armor
-			armor_skirts
+		    tank_riveted_armor
+			tank_medium_three_man_tank_turret
+			tank_bogie_suspension 
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			tank_diesel_engine
 			easy_maintenance
 		}
 	}
@@ -839,14 +853,14 @@ TIX_heavy_tanks = {
 
 	blocked_for = {}
 
-	available_for = { TIX }
+	available_for = { TIX SAD YUW HUJ BYG BFL BYG WEX DOH DH1 }
 
 	roles = {
 		land_heavy_tank
 	}
 
 	priority = {
-		factor = 0
+		factor = 3000
 	}
 	
 	basic_heavy_tank_default = { #Somua S35
@@ -890,7 +904,7 @@ TIX_heavy_tanks = {
 				special_type_slot_4 = secondary_turret_small_cannon
 			}
 			upgrades = {
-				tank_nsb_engine_upgrade = 5
+				tank_nsb_engine_upgrade = 0
 				tank_nsb_armor_upgrade = 0
 			}
 		}
@@ -914,7 +928,7 @@ TIX_heavy_tanks = {
 
 	improved_heavy_tank_default = {#AMC 35
 		priority = {
-			factor = 0
+			factor = 200
 			modifier = { 
 				has_tech = advanced_heavy_tank_chassis
 				factor = 0 #let's not waste XP here
@@ -928,44 +942,30 @@ TIX_heavy_tanks = {
 				main_armament_slot = { 
 					any_of = { 
 					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
+			            tank_medium_cannon_2
 					} 
 				}
 				turret_type_slot = tank_heavy_three_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_welded_armor
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_riveted_armor
 				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
+				special_type_slot_1 = tank_radio_3
 				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
+				special_type_slot_3 = secondary_turret_small_cannon
 				special_type_slot_4 = secondary_turret_small_cannon
 			}
 			upgrades = {
-				tank_nsb_engine_upgrade = 5
+				tank_nsb_engine_upgrade = 0
 				tank_nsb_armor_upgrade = 4
 			}
 		}
 
 		allowed_modules = {
 			tank_heavy_cannon_3
-		    tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_close_support_gun
+		    tank_medium_cannon_2
 			tank_heavy_three_man_tank_turret
-			tank_bogie_suspension
-			tank_welded_armor
+			tank_torsion_bar_suspension
+			tank_riveted_armor
 			tank_diesel_engine
 			tank_radio_3
 			tank_radio_2
@@ -977,7 +977,7 @@ TIX_heavy_tanks = {
 
 	advanced_heavy_tank_default = { #SARL42
 		priority = {
-			factor = 0
+			factor = 500
 		}
 
 		target_variant = {
@@ -987,43 +987,29 @@ TIX_heavy_tanks = {
 				main_armament_slot = { 
 					any_of = { 
 					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_heavy_three_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
+			            tank_medium_cannon_2
 					}
 				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = tank_radio_3
 				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
+				special_type_slot_3 = secondary_turret_small_cannon
 				special_type_slot_4 = secondary_turret_small_cannon
 			}
 			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = 4
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = 14
 			}
 		}
 
 		allowed_modules = {
 		    tank_heavy_cannon_3
-		    tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_close_support_gun
+		    tank_medium_cannon_2
 			tank_heavy_three_man_tank_turret
-			tank_bogie_suspension
+			tank_torsion_bar_suspension
 			tank_welded_armor
 			tank_diesel_engine
 			tank_radio_3
diff --git a/src/common/ai_equipment/YUW_tank.txt b/src/common/ai_equipment/YUW_tank.txt
index 3c97e20..76e9e7e 100755
--- a/src/common/ai_equipment/YUW_tank.txt
+++ b/src/common/ai_equipment/YUW_tank.txt
@@ -1,228 +1,10 @@
-YUW_light_tanks = {
-	category = land
-	blocked_for = {}
-	available_for = { YUW }
-	roles = {
-		land_light_tank
-	}
-	priority = {
-		factor = 3000
-	}
-	basic_light_tank_default = { #Somua S35
-		priority = {
-			factor = 300
-			modifier = { 
-				has_tech = improved_light_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		history = yes
-		target_variant = {
-			match_value = 10000
-			type = light_tank_chassis_1
-			modules = {
-				main_armament_slot = tank_close_support_gun
-				turret_type_slot = tank_light_three_man_tank_turret
-				suspension_type_slot = tank_wheeled_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 9
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_heavy_machine_gun
-			tank_close_support_gun
-			tank_light_three_man_tank_turret
-			tank_wheeled_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			extra_ammo_storage
-			easy_maintenance
-		}
-	}
-	improved_light_tank_default = {#AMC 35
-		priority = {
-			factor = 400
-			modifier = { 
-				has_tech = advanced_light_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		history = yes
-		target_variant = {
-			match_value = 10000
-			type = light_tank_chassis_2
-			modules = {
-				main_armament_slot = tank_close_support_gun
-				turret_type_slot = tank_light_three_man_tank_turret
-				suspension_type_slot = tank_wheeled_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = extra_ammo_storage
-				special_type_slot_3 = extra_ammo_storage
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 8
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_heavy_machine_gun
-			tank_close_support_gun
-			tank_light_three_man_tank_turret
-			tank_wheeled_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			extra_ammo_storage
-			easy_maintenance
-		}
-	}
-	advanced_light_tank_default = { #SARL42
-		priority = {
-			factor = 1000
-		}
-		history = yes
-		target_variant = {
-			match_value = 10000
-			type = light_tank_chassis_3
-			modules = {
-				main_armament_slot = tank_close_support_gun
-				turret_type_slot = tank_light_three_man_tank_turret
-				suspension_type_slot = tank_wheeled_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = extra_ammo_storage
-				special_type_slot_3 = extra_ammo_storage
-				special_type_slot_4 = extra_ammo_storage
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_heavy_machine_gun
-			tank_close_support_gun
-			tank_light_three_man_tank_turret
-			tank_wheeled_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			extra_ammo_storage
-			easy_maintenance
-		}
-	}
-}
-
-YUW_medium_flame_tank = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = {YUW}
-
-	roles = {
-		land_medium_tank_flamethrower
-	}
-
-	priority = {
-		factor = 15000
-	}
-
-	basic_medium_flame_tank_default = {
-		priority = {
-			factor = 10000
-			modifier = { 
-				has_tech = improved_medium_tank_chassis 
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 10000
-			type = medium_tank_flame_chassis
-			modules = {
-				main_armament_slot = flamethrower
-				turret_type_slot = tank_light_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-
-		allowed_modules = {
-		    flamethrower
-			tank_light_fixed_superstructure_turret
-			tank_christie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			easy_maintenance
-		}
-	}
-	improved_medium_flame_tank_default = {
-		priority = {
-			factor = 10000
-			modifier = { 
-				NOT = { has_tech = improved_medium_tank_chassis }
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 10000
-			type = medium_tank_flame_chassis
-			modules = {
-				main_armament_slot = advanced_flamethrower
-				turret_type_slot = tank_light_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = easy_maintenance
-				special_type_slot_2 = extra_ammo_storage
-				special_type_slot_3 = extra_ammo_storage
-				special_type_slot_4 = extra_ammo_storage
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-
-		allowed_modules = {
-		    advanced_flamethrower
-			tank_light_fixed_superstructure_turret
-			tank_christie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			easy_maintenance
-			extra_ammo_storage
-		}
-	}
-}
 
 YUW_medium_tanks = {
 	category = land
 
 	blocked_for = {}
 
-	available_for = {YUW}
+	available_for = { YUW HUJ BYG }
 
 	roles = {
 		land_medium_tank
@@ -319,7 +101,7 @@ YUW_medium_tanks = {
 			}
 			upgrades = {
 				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
+				tank_nsb_armor_upgrade = 4
 			}
 		}
 
@@ -362,7 +144,7 @@ YUW_medium_tanks = {
 			modules = {
 				main_armament_slot = tank_medium_cannon_2
 				turret_type_slot = tank_medium_three_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
+				suspension_type_slot = tank_bogie_suspension
 				armor_type_slot = tank_riveted_armor
 				engine_type_slot = tank_gasoline_engine
 				special_type_slot_1 = {
@@ -378,14 +160,13 @@ YUW_medium_tanks = {
 			}
 			upgrades = {
 				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
+				tank_nsb_armor_upgrade = 4
 			}
 		}
 
 		allowed_modules = {
 			tank_medium_cannon
 			tank_medium_cannon_2
-			tank_christie_suspension
 			tank_riveted_armor
 			tank_diesel_engine
 			easy_maintenance
@@ -421,7 +202,7 @@ YUW_medium_tanks = {
 			modules = {
 				main_armament_slot = tank_medium_cannon_2
 				turret_type_slot = tank_medium_three_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
+				suspension_type_slot = tank_bogie_suspension
 				armor_type_slot = tank_riveted_armor
 				engine_type_slot = tank_gasoline_engine
 				special_type_slot_1 = {
@@ -437,7 +218,7 @@ YUW_medium_tanks = {
 			}
 			upgrades = {
 				tank_nsb_engine_upgrade = 4
-				tank_nsb_armor_upgrade = 4
+				tank_nsb_armor_upgrade = 9
 			}
 		}
 
@@ -445,7 +226,6 @@ YUW_medium_tanks = {
 			tank_medium_cannon
 			tank_medium_cannon_2
 			tank_torsion_bar_suspension
-			tank_christie_suspension
 			tank_riveted_armor
 			tank_diesel_engine
 			easy_maintenance
@@ -465,1058 +245,4 @@ YUW_medium_tanks = {
 			tank_radio_1
 		}
 	}
-}
-
-
-
-YUW_medium_tank_destroyers = {
-	category = land
-	blocked_for = {}
-	available_for = { YUW }
-	roles = {
-		land_medium_tank_destroyer
-	}
-	priority = {
-		factor = 3000
-	}
-	medium_tank_destroyer_1 = { #Somua S35
-		priority = {
-			factor = 100
-			modifier = { 
-				has_tech = improved_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_destroyer_chassis_1
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-						tank_high_velocity_cannon_3
-					    tank_heavy_cannon_3
-						tank_high_velocity_cannon_2
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-						tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = dozer_blade
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 10
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_christie_suspension
-		    tank_riveted_armor
-			tank_cast_armor
-			tank_gasoline_engine			
-			easy_maintenance
-			secondary_turret_small_cannon
-			dozer_blade
-		}
-	}
-	medium_tank_destroyer_2 = {#AMC 35
-		priority = {
-			factor = 200
-			modifier = { 
-				has_tech = advanced_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_destroyer_chassis_2
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-						tank_high_velocity_cannon_3
-					    tank_heavy_cannon_3
-						tank_high_velocity_cannon_2
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-						tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = dozer_blade
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-		    tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_christie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine			
-			easy_maintenance
-			secondary_turret_small_cannon
-			dozer_blade
-		}
-	}
-	medium_tank_destroyer_3 = { #SARL42
-		priority = {
-			factor = 300
-			modifier = { 
-				NOT = { has_tech = advanced_medium_tank_chassis } 
-				factor = 0 #let's not waste XP here
-			}
-		}
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_destroyer_chassis
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-						tank_high_velocity_cannon_3
-					    tank_heavy_cannon_3
-						tank_high_velocity_cannon_2
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-						tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = dozer_blade
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 0
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-		allowed_modules = {
-		    tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_medium_cannon_2
-			tank_medium_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_christie_suspension
-		    tank_riveted_armor
-			tank_cast_armor
-			tank_gasoline_engine			
-			easy_maintenance
-			secondary_turret_small_cannon
-			dozer_blade
-		}
-	}
-}
-
-YUW_medium_tank_anti_air = {
-	category = land
-	blocked_for = {}
-	available_for = { YUW }
-	roles = {
-		land_medium_tank_anti_air
-	}
-	priority = {
-		factor = 500
-	}
-	medium_tank_anti_air_0 = { #Somua S35
-		priority = {
-			factor = 300
-			modifier = { 
-				has_tech = basic_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_aa_chassis_0
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_anti_air_cannon_2
-						tank_anti_air_cannon
-					} 
-				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = dozer_blade
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 9
-				tank_nsb_armor_upgrade = 9
-			}
-		}
-		allowed_modules = {
-            tank_anti_air_cannon_2
-			tank_anti_air_cannon
-		    tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_gasoline_engine 
-			tank_christie_suspension
-			sloped_armor
-			armor_skirts
-			easy_maintenance
-			dozer_blade
-		}
-	}
-	medium_tank_anti_air_1 = { #Somua S35
-		priority = {
-			factor = 300
-			modifier = { 
-				has_tech = improved_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_aa_chassis_1
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_anti_air_cannon_2
-						tank_anti_air_cannon
-					} 
-				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = dozer_blade
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 14
-				tank_nsb_armor_upgrade = 10
-			}
-		}
-		allowed_modules = {
-            tank_anti_air_cannon_2
-			tank_anti_air_cannon
-		    tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_gasoline_engine 
-			tank_christie_suspension
-			sloped_armor
-			armor_skirts
-			easy_maintenance
-			dozer_blade
-		}
-	}
-	medium_tank_anti_air_2 = {#AMC 35
-		priority = {
-			factor = 400
-			modifier = { 
-				has_tech = advanced_medium_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_aa_chassis_2
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_anti_air_cannon_2
-						tank_anti_air_cannon
-					} 
-				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = dozer_blade
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 15
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-		    tank_anti_air_cannon_2
-			tank_anti_air_cannon
-		    tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_gasoline_engine 
-			tank_christie_suspension
-			sloped_armor
-			armor_skirts
-			easy_maintenance
-			dozer_blade
-		}
-	}
-	medium_tank_anti_air_3 = { #SARL42
-		priority = {
-			factor = 1000
-			modifier = { 
-				NOT = { has_tech = advanced_medium_tank_chassis } 
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = medium_tank_aa_chassis_3
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_anti_air_cannon_2
-						tank_anti_air_cannon
-					} 
-				}
-				turret_type_slot = tank_light_one_man_tank_turret
-				suspension_type_slot = tank_christie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = sloped_armor
-				special_type_slot_2 = armor_skirts
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = dozer_blade
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 15
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-		    tank_anti_air_cannon_2
-			tank_anti_air_cannon
-		    tank_cast_armor
-			tank_light_one_man_tank_turret
-			tank_gasoline_engine 
-			tank_christie_suspension
-			sloped_armor
-			armor_skirts
-			easy_maintenance
-			dozer_blade
-		}
-	}
-}
-
-YUW_heavy_tanks = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = { YUW }
-
-	roles = {
-		land_heavy_tank
-	}
-
-	priority = {
-		factor = 0
-	}
-	
-	basic_heavy_tank_default = { #Somua S35
-		priority = {
-			factor = 0
-			modifier = { 
-				has_tech = improved_heavy_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_chassis_1
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_heavy_three_man_tank_turret
-				suspension_type_slot = tank_torsion_bar_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = 0
-			}
-		}
-
-		allowed_modules = {
-		    tank_heavy_cannon_3
-		    tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_close_support_gun
-			tank_heavy_three_man_tank_turret
-			tank_torsion_bar_suspension
-			tank_welded_armor
-			tank_diesel_engine
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			secondary_turret_small_cannon
-			easy_maintenance
-		}
-	}
-
-	improved_heavy_tank_default = {#AMC 35
-		priority = {
-			factor = 0
-			modifier = { 
-				has_tech = advanced_heavy_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_chassis_2
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_heavy_three_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = 4
-			}
-		}
-
-		allowed_modules = {
-			tank_heavy_cannon_3
-		    tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_close_support_gun
-			tank_heavy_three_man_tank_turret
-			tank_bogie_suspension
-			tank_welded_armor
-			tank_diesel_engine
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			secondary_turret_small_cannon
-			easy_maintenance
-		}
-	}
-
-	advanced_heavy_tank_default = { #SARL42
-		priority = {
-			factor = 0
-		}
-
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_chassis_3
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_heavy_three_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = {
-					any_of = { 
-					tank_radio_3
-					tank_radio_2
-					tank_radio_1
-					}
-				}
-				special_type_slot_2 = secondary_turret_small_cannon
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = secondary_turret_small_cannon
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = 4
-			}
-		}
-
-		allowed_modules = {
-		    tank_heavy_cannon_3
-		    tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_close_support_gun
-			tank_heavy_three_man_tank_turret
-			tank_bogie_suspension
-			tank_welded_armor
-			tank_diesel_engine
-			tank_radio_3
-			tank_radio_2
-			tank_radio_1
-			secondary_turret_small_cannon
-			easy_maintenance
-		}
-	}
-}
-
-YUW_heavy_tank_destroyers = {
-	category = land
-	blocked_for = {}
-	available_for = { YUW }
-	roles = {
-		land_heavy_tank_destroyer
-	}
-	priority = {
-		factor = 0
-	}
-	heavy_tank_destroyer_1 = { #Somua S35
-		priority = {
-			factor = 0
-			modifier = { 
-				has_tech = improved_heavy_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_destroyer_chassis_1
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = armor_skirts
-				special_type_slot_2 = sloped_armor
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 14
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_bogie_suspension
-		    tank_cast_armor
-			tank_diesel_engine
-			armor_skirts
-			sloped_armor
-			easy_maintenance
-		}
-	}
-	heavy_tank_destroyer_2 = {#AMC 35
-		priority = {
-			factor = 0
-			modifier = { 
-				has_tech = advanced_heavy_tank_chassis
-				factor = 0 #let's not waste XP here
-			}
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_destroyer_chassis_2
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = armor_skirts
-				special_type_slot_2 = sloped_armor
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 12
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_bogie_suspension
-		    tank_cast_armor
-			tank_diesel_engine
-			armor_skirts
-			sloped_armor
-			easy_maintenance
-		}
-	}
-	heavy_tank_destroyer_3 = { #SARL42
-		priority = {
-			factor = 0
-		}
-		
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_destroyer_chassis_3
-			modules = {
-				main_armament_slot = { 
-					any_of = { 
-					    tank_heavy_cannon_3
-			            tank_heavy_cannon_2
-					    tank_heavy_cannon
-					    tank_medium_cannon_2
-				    	tank_medium_cannon
-				    	tank_high_velocity_cannon_3
-				    	tank_high_velocity_cannon_2
-				    	tank_high_velocity_cannon
-					} 
-				}
-				turret_type_slot = tank_medium_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_cast_armor
-				engine_type_slot = tank_diesel_engine
-				special_type_slot_1 = armor_skirts
-				special_type_slot_2 = sloped_armor
-				special_type_slot_3 = easy_maintenance
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 12
-				tank_nsb_armor_upgrade = 20
-			}
-		}
-		allowed_modules = {
-			tank_heavy_cannon_3
-			tank_heavy_cannon_2
-			tank_heavy_cannon
-			tank_high_velocity_cannon_3
-			tank_high_velocity_cannon_2
-			tank_high_velocity_cannon
-			tank_medium_fixed_superstructure_turret
-			tank_bogie_suspension
-		    tank_cast_armor
-			tank_diesel_engine
-			armor_skirts
-			sloped_armor
-			easy_maintenance
-		}
-	}
-}
-
-YUW_heavy_tank_artillery = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = {YUW}
-
-	roles = {
-		land_heavy_tank_artillery
-	}
-
-	priority = {
-		factor = 0
-	}
-	heavy_tank_artillery_1 = {
-		priority = {
-			factor = 0
-			
-		}
-		enable = {
-			has_tech = interwar_artillery
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_artillery_chassis_1
-			modules = {
-				main_armament_slot = tank_medium_howitzer
-				turret_type_slot = tank_heavy_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = empty
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 4
-				tank_nsb_armor_upgrade = {
-					base = 3
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_medium_howitzer
-			tank_heavy_fixed_superstructure_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-		}
-	}
-	heavy_tank_artillery_2 = {
-		priority = {
-			factor = 0
-			
-		}
-		enable = {
-				has_tech = interwar_artillery
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 1500
-			type = heavy_tank_artillery_chassis_2
-			modules = {
-				main_armament_slot = tank_medium_howitzer_2
-				turret_type_slot = tank_heavy_fixed_superstructure_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = extra_ammo_storage
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = {
-					base = 4
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_medium_howitzer_2
-			tank_heavy_fixed_superstructure_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-			extra_ammo_storage
-		}
-	}
-
-	heavy_tank_artillery_3 = {
-		priority = {
-			factor = 0
-			
-		}
-		enable = {
-			has_tech = artillery5
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 2000
-			type = heavy_tank_artillery_chassis_3
-			modules = {
-				main_armament_slot = tank_heavy_howitzer
-				turret_type_slot = tank_heavy_fixed_superstructure_turret
-				suspension_type_slot = tank_interleaved_suspension
-				armor_type_slot = tank_welded_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = extra_ammo_storage
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 6
-				tank_nsb_armor_upgrade = {
-					base = 8
-					modifier = {
-						add = 4
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_heavy_howitzer
-			tank_heavy_fixed_superstructure_turret
-			tank_interleaved_suspension
-			tank_welded_armor
-			tank_gasoline_engine
-			extra_ammo_storage
-		}
-	}
-}
-
-YUW_heavy_tank_anti_air = {
-	category = land
-
-	blocked_for = {}
-
-	available_for = {YUW}
-
-	roles = {
-		land_heavy_tank_anti_air
-	}
-
-	priority = {
-		factor = 0
-	}
-	heavy_tank_anti_air_1 = {
-		priority = {
-			factor = 1
-			
-		}
-		enable = {
-			has_tech = interwar_antiair
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 1000
-			type = heavy_tank_aa_chassis_1
-			modules = {
-				main_armament_slot = tank_anti_air_cannon
-				turret_type_slot = tank_heavy_two_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = empty
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 4
-				tank_nsb_armor_upgrade = {
-					base = 3
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_anti_air_cannon
-			tank_heavy_two_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-		}
-	}
-	heavy_tank_anti_air_2 = {
-		priority = {
-			factor = 0
-		}
-		enable = {
-			has_tech = antiair2
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 1500
-			type = heavy_tank_aa_chassis_2
-			modules = {
-				main_armament_slot = tank_anti_air_cannon_2
-				turret_type_slot = tank_heavy_two_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = empty
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 4
-				tank_nsb_armor_upgrade = {
-					base = 2
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_anti_air_cannon_2
-			tank_heavy_two_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-		}
-	}
-
-	heavy_tank_anti_air_3 = {
-		priority = {
-			factor = 0
-		}
-		enable = {
-			has_tech = antiair5
-		}
-
-		history = yes
-		target_variant = {
-			match_value = 2500
-			type = heavy_tank_aa_chassis_3
-			modules = {
-				main_armament_slot = tank_anti_air_cannon_3
-				turret_type_slot = tank_heavy_two_man_tank_turret
-				suspension_type_slot = tank_bogie_suspension
-				armor_type_slot = tank_riveted_armor
-				engine_type_slot = tank_gasoline_engine
-				special_type_slot_1 = empty
-				special_type_slot_2 = empty
-				special_type_slot_3 = empty
-				special_type_slot_4 = empty
-			}
-			upgrades = {
-				tank_nsb_engine_upgrade = 5
-				tank_nsb_armor_upgrade = {
-					base = 3
-					modifier = {
-						add = 1
-						has_war = yes
-					}
-				}
-			}
-		}
-
-		allowed_modules = {
-			tank_anti_air_cannon_3
-			tank_heavy_two_man_tank_turret
-			tank_bogie_suspension
-			tank_riveted_armor
-			tank_gasoline_engine
-		}
-	}
 }
\ No newline at end of file
diff --git a/src/common/ai_strategy/BFL.txt b/src/common/ai_strategy/BFL.txt
index ecc00d9..bd28e03 100755
--- a/src/common/ai_strategy/BFL.txt
+++ b/src/common/ai_strategy/BFL.txt
@@ -1779,4 +1779,25 @@ BFL_aifc_linear_defence = {
 		type = force_concentration_factor
 		value = -100  # Just don't
 	}
+}
+
+BFL_heavytank_production = {
+	allowed = {
+		original_tag = BFL
+	}
+	enable = {
+		has_tech = improved_heavy_tank_chassis
+		date > 1940.1.1
+		arms_factory > 199
+	}
+	ai_strategy = {
+		type = role_ratio	#模板倾向
+		id = heavy_armor
+		value = 50
+	}
+	ai_strategy = {
+		type = template_prio	#训练模板倾向
+		id = heavy_armor
+		value = 50
+	}
 }
\ No newline at end of file
diff --git a/src/common/ai_strategy/BYG.txt b/src/common/ai_strategy/BYG.txt
index ff3e8df..56f62af 100755
--- a/src/common/ai_strategy/BYG.txt
+++ b/src/common/ai_strategy/BYG.txt
@@ -1916,4 +1916,25 @@ BYG_base_faction_priorities = {
 		id = unlock_faction_commander
 		value = 5
 	}
+}
+
+BYG_heavytank_production = {
+	allowed = {
+		original_tag = BYG
+	}
+	enable = {
+		has_tech = improved_heavy_tank_chassis
+		date > 1940.1.1
+		arms_factory > 399
+	}
+	ai_strategy = {
+		type = role_ratio	#模板倾向
+		id = heavy_armor
+		value = 20
+	}
+	ai_strategy = {
+		type = template_prio	#训练模板倾向
+		id = heavy_armor
+		value = 20
+	}
 }
\ No newline at end of file
diff --git a/src/common/ai_strategy/HUJ.txt b/src/common/ai_strategy/HUJ.txt
index ec1d138..aefa1a7 100755
--- a/src/common/ai_strategy/HUJ.txt
+++ b/src/common/ai_strategy/HUJ.txt
@@ -515,7 +515,7 @@ HUJ_gang_up_TIX_with_BYG = {
 	}
 	ai_strategy = {
 		type = force_defend_ally_borders
-		value = 100
+		value = 500
 		target = africa
 	}
 }
@@ -1194,10 +1194,11 @@ HUJ_protect_asia_ore = {
 }
 
 HUJ_protect_africa_ore = {
-	allowed = {
-		original_tag = HUJ
-	}
 	enable = {
+		OR = {
+			original_tag = HUJ
+			is_subject_of = HUJ
+		}
 		has_war = yes
 		country_exists = SAD
 	}
@@ -1207,7 +1208,7 @@ HUJ_protect_africa_ore = {
 	 	type = put_unit_buffers
 
 		# ratio of total armeis in country to be buffered
-	 	ratio = 0.1
+	 	ratio = 0.4
 
 		# you can specify an order id. ratio of same orders ids will be share same ratio
 	 	order_id = 1
@@ -1217,6 +1218,7 @@ HUJ_protect_africa_ore = {
 	 		452
 			447
 			446
+			907
 	 	} 
 
 		# ai areas that the orders will use these buffers in
@@ -2248,11 +2250,12 @@ HUJ_BYG_take_italys_spaghetti = {
 		OR = {
 			original_tag = BYG
 			original_tag = HUJ
+			is_subject_of = HUJ
 		}
 		is_historical_focus_on = yes
 	}
 	enable = {
-		date > 1941.6.1
+		date > 1939.8.1
 		SAD = {
 			surrender_progress < 0.2
 		}
@@ -2262,19 +2265,19 @@ HUJ_BYG_take_italys_spaghetti = {
 	ai_strategy = {
 		type = area_priority
 		id = italy
-		value = 60
+		value = 200
 	}
 
 	ai_strategy = {
 		type = area_priority
 		id = north_africa
-		value = 100
+		value = 500
 	}
 
 	ai_strategy = {
 		type = area_priority
 		id = normandy_landing_zone
-		value = -100
+		value = -200
 	}
 }
 
@@ -2634,9 +2637,9 @@ HUJ_no_naval_landings_in_libya_yet = {
 	allowed = { original_tag = HUJ }
 	enable = {
 		is_historical_focus_on = yes  # Don't like locking it behind a checkbox...
-		date < 1943.5.1  # Historically, the North African campaign concluded May 1943. If Allies have not won there yet at this point, let them invade.
+		date < 1941.4.1  # Historically, the North African campaign concluded May 1943. If Allies have not won there yet at this point, let them invade.
 		OR = {
-			date < 1941.8.1 # If Tobruk hasn't fallen by this time, maybe it's time to start thinking about going around
+			date < 1941.6.1 # If Tobruk hasn't fallen by this time, maybe it's time to start thinking about going around
 			451 = { is_controlled_by_ROOT_or_ally = yes } # Tobruk is in our hands, we can continue on land
 		}
 		OR = {
@@ -2662,7 +2665,7 @@ HUJ_to_tobruk = {
 	enable = {
 		# NOTE: make sure these conditions are largely the same as for ENG_supply_for_tobruk_push below
 		is_historical_focus_on = yes
-		date > 1940.12.1 # Operation Compass
+		date > 1940.2.1 # Operation Compass
 		date < 1943.6.1
 		451 = { is_controlled_by = SAD }
 		SAD = { is_ai = yes }
@@ -2685,7 +2688,7 @@ HUJ_to_tobruk = {
 	ai_strategy = {
 		type = area_priority
 		id = north_africa
-		value = 50
+		value = 500
 	}
 
 	ai_strategy = {
@@ -2836,4 +2839,25 @@ HUJ_become_supreme_commander = {
 		id = unlock_faction_commander
 		value = 5
 	}
+}
+
+HUJ_heavytank_production = {
+	allowed = {
+		original_tag = HUJ
+	}
+	enable = {
+		has_tech = improved_heavy_tank_chassis
+		date > 1940.1.1
+		arms_factory > 299
+	}
+	ai_strategy = {
+		type = role_ratio	#模板倾向
+		id = heavy_armor
+		value = 40
+	}
+	ai_strategy = {
+		type = template_prio	#训练模板倾向
+		id = heavy_armor
+		value = 40
+	}
 }
\ No newline at end of file
diff --git a/src/common/ai_strategy/SAD.txt b/src/common/ai_strategy/SAD.txt
index 698bebb..947a178 100755
--- a/src/common/ai_strategy/SAD.txt
+++ b/src/common/ai_strategy/SAD.txt
@@ -315,21 +315,21 @@ SAD_hold_africa = {
 	ai_strategy = {
 		type = theatre_distribution_demand_increase
 		id = 448
-		value = 2
+		value = 1
 	}
 
 	# Benghasi
 	ai_strategy = {
 		type = theatre_distribution_demand_increase
 		id = 450
-		value = 2
+		value = 1
 	}
 
 	# Alexandria
 	ai_strategy = {
 		type = theatre_distribution_demand_increase
 		id = 447
-		value = 2
+		value = 1
 	}
 }
 
@@ -693,7 +693,7 @@ SAD_war_with_HUJ = {
 	ai_strategy = {
 		type = front_unit_request
 		tag = HUJ		
-		value = 40
+		value = 20
 	}
 	ai_strategy = {
 		type = invade
@@ -838,7 +838,7 @@ SAD_dont_do_so_many_naval_invasions_please = {	#我求你啦不要让我再看
 
 SAD_protect_bentu_ore = {
 	allowed = {
-		original_tag = TIX
+		original_tag = SAD
 	}
 	enable = {
 		has_war_with = HUJ
diff --git a/src/common/ai_strategy/TIX.txt b/src/common/ai_strategy/TIX.txt
index 7cd5f8e..aed9c13 100755
--- a/src/common/ai_strategy/TIX.txt
+++ b/src/common/ai_strategy/TIX.txt
@@ -361,7 +361,7 @@ TIX_template_design = {
 	ai_strategy = {
 		type = template_prio
 		id = heavy_armor
-		value = -100
+		value = 0
 	}
 
 	ai_strategy = {
@@ -2956,4 +2956,41 @@ TIX_base_faction_priorities = {
 		id = unlock_doctrine_sharing
 		value = 10
 	}
+}
+
+TIX_heavytank_production = {
+	allowed = {
+		original_tag = TIX
+	}
+	enable = {
+		has_tech = improved_heavy_tank_chassis
+		date > 1940.1.1
+		arms_factory > 299
+	}
+	ai_strategy = {
+		type = role_ratio	#模板倾向
+		id = heavy_armor
+		value = 20
+	}
+	ai_strategy = {
+		type = template_prio	#训练模板倾向
+		id = heavy_armor
+		value = 20
+	}
+}
+
+TIX_dont_help_IRQ = {
+	allowed = {
+		original_tag = TIX
+	}
+	enable = {
+		is_in_faction_with = IRQ
+		country_exists = BFL
+	}
+	abort_when_not_enabled = yes
+	ai_strategy = {
+		type = dont_defend_ally_borders
+		value = 5000
+		id = "IRQ"
+	}
 }
\ No newline at end of file
diff --git a/src/common/ai_templates/templates_heavyarmor.txt b/src/common/ai_templates/templates_heavyarmor.txt
new file mode 100755
index 0000000..6e18e12
--- /dev/null
+++ b/src/common/ai_templates/templates_heavyarmor.txt
@@ -0,0 +1,81 @@
+breakthrough_armor_AZ = {
+
+	available_for = {
+		TIX
+		BFL
+		BYG
+		HUJ
+	}
+
+	role = heavy_armor
+	front_role_override = offence
+
+	upgrade_prio = {
+		base = 1
+		modifier = { # maybe heavies aren't THAT important 
+			factor = 200
+			date > 1940.1.1 
+		}
+	}
+
+	heavy_armor_base_TIX = {
+		upgrade_prio = {
+			base = 1
+			modifier = {
+				factor = 1000
+				tag = TIX 
+			}
+			modifier = {
+				factor = 1000
+				tag = BYG 
+			}
+		}
+		reinforce_prio = 2
+
+		target_template = {
+
+			support = {
+				armored_engineer = 1
+				light_tank_recon = 1
+				medium_flame_tank = 1
+				helicopter_transport = 1
+				armored_maintenance = 1
+			}
+			regiments = {
+			    heavy_armor = 8
+				mechanized = 8
+			}
+		}
+	}
+
+	heavy_armor_base_BFL = {
+		upgrade_prio = {
+			base = 1
+			modifier = {
+				factor = 1000
+				tag = BFL 
+			}
+			modifier = {
+				factor = 1000
+				tag = HUJ 
+			}
+		}
+		reinforce_prio = 2
+
+		target_template = {
+
+			support = {
+				armored_engineer = 1
+				light_tank_recon = 1
+				medium_flame_tank = 1
+				helicopter_transport = 1
+				armored_maintenance = 1
+			}
+			regiments = {
+			    heavy_armor = 8
+				infantry = 10
+			}
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/src/common/buildings/00_buildings.txt b/src/common/buildings/00_buildings.txt
index b5ad05a..59c81fb 100755
--- a/src/common/buildings/00_buildings.txt
+++ b/src/common/buildings/00_buildings.txt
@@ -62,7 +62,7 @@ buildings = {
 		infrastructure_construction_effect = yes
 		level_cap = {
 			shares_slots = yes
-			state_max = 20
+			state_max = 40
 		}
 	}
 
@@ -76,7 +76,7 @@ buildings = {
 		infrastructure_construction_effect = yes
 		level_cap = {
 			shares_slots = yes
-			state_max = 20
+			state_max = 40
 		}
 	}
 
@@ -90,7 +90,7 @@ buildings = {
 		allied_build = yes
 		infrastructure_construction_effect = yes
 		level_cap = {
-			state_max = 10
+			state_max = 20
 		}
 	}
 
@@ -234,7 +234,7 @@ buildings = {
 		infrastructure_construction_effect = yes
 		level_cap = {
 			shares_slots = yes
-			state_max = 20
+			state_max = 50
 		}
 	}
 
diff --git a/src/common/decisions/tianjiang_aizuobi_decisions.txt b/src/common/decisions/tianjiang_aizuobi_decisions.txt
index 3c7e9fd..da7b6bd 100755
--- a/src/common/decisions/tianjiang_aizuobi_decisions.txt
+++ b/src/common/decisions/tianjiang_aizuobi_decisions.txt
@@ -1,4 +1,53 @@
 tianjiang_aizuobi = {
+	ai_zhongtanzuobi = {
+		available = {
+			OR = {
+				tag = BFL
+				tag = TIX
+				tag = HUJ
+				tag = BYG
+			}
+			is_ai = yes
+			date > 1940.1.1
+		}
+		visible = {
+			is_ai = yes
+		}
+		ai_will_do = {
+			factor = 10000
+		}
+		fire_only_once = yes
+		complete_effect = {
+			set_technology = {
+				improved_heavy_tank_chassis = 1
+			}
+			if = {
+				limit = {
+					tag = TIX
+				}
+				create_equipment_variant = {
+					name = "虎式坦克"
+					type = heavy_tank_chassis_2
+					parent_version = 0
+					modules = {
+						main_armament_slot = tank_medium_cannon_2
+						turret_type_slot = tank_heavy_three_man_tank_turret
+						suspension_type_slot = tank_torsion_bar_suspension
+						armor_type_slot = tank_riveted_armor
+						engine_type_slot = tank_diesel_engine
+						special_type_slot_1 = tank_radio_2
+						special_type_slot_2 = secondary_turret_small_cannon
+						special_type_slot_3 = secondary_turret_small_cannon
+							special_type_slot_4 = secondary_turret_small_cannon
+					}
+					upgrades = {
+						tank_nsb_engine_upgrade = 0
+						tank_nsb_armor_upgrade = 4
+					}
+				}
+			}
+		}
+	}
 	ai_shusifangyu_FKaizuobi = {
 		available = {
 			is_ai = yes
diff --git a/src/common/decisions/tianjiang_decision.txt b/src/common/decisions/tianjiang_decision.txt
index 91c041b..f39f5d4 100755
--- a/src/common/decisions/tianjiang_decision.txt
+++ b/src/common/decisions/tianjiang_decision.txt
@@ -1194,6 +1194,17 @@ TIX_jihua = {
 }
 
 TIX_neiwu = {
+	TIX_neiwu_debug = {
+		visible = {
+			is_debug = yes
+		}
+		complete_effect = {
+			#TIX_z47 = {
+			#	unit_leader_event = getzhg_event.2602
+			#}
+		}
+
+	}
 	#奖励转移至核心圈国策中
 	#TIX_lbxjhua = {
 	#	icon = hongsegantan
diff --git a/src/common/decisions/xingdong_decisions.txt b/src/common/decisions/xingdong_decisions.txt
index abea68a..aaed323 100755
--- a/src/common/decisions/xingdong_decisions.txt
+++ b/src/common/decisions/xingdong_decisions.txt
@@ -2273,7 +2273,7 @@ xingdong_category = {
 		custom_cost_text = mf_shuliang_4
 		complete_effect = { 
 			custom_effect_tooltip = az_ziyuanzhuanhua_tan_tooltip
-			add_to_variable = { az_ziyuanzhuanhua_tan = 120 }
+			add_to_variable = { az_ziyuanzhuanhua_tan = 300 }
 			force_update_dynamic_modifier = yes
 			add_to_variable = {
 				var = xzmf_sl
diff --git a/src/common/defines/az_defines.lua b/src/common/defines/az_defines.lua
index d19b433..d1d17c9 100755
--- a/src/common/defines/az_defines.lua
+++ b/src/common/defines/az_defines.lua
@@ -23,6 +23,7 @@ NDefines.NCountry.BASE_MAX_COMMAND_POWER = 400
 NDefines.NCountry.BASE_COMMAND_POWER_GAIN = 0.6	
 
 --下划线
+NDefines.NBuildings.MAX_SHARED_SLOTS = 50						-- 建筑槽上限
 NDefines.NDiplomacy.MAX_TRUST_VALUE = 200						-- 最大关系上限
 NDefines.NDiplomacy.MIN_TRUST_VALUE = -200						-- 最小关系上限
 NDefines.NDiplomacy.MAX_OPINION_VALUE = 200						-- 最大关系上限
@@ -43,6 +44,17 @@ NDefines.NMilitary.FIELD_EXPERIENCE_MAX_PER_DAY = 3.0				-- 你每天可以获
 NDefines.NGame.GAME_SPEED_SECONDS = { 1.0, 0.2, 0.1, 0.05, 0.0 }			--提速，必须是5的倍数
 NDefines.NCountry.SPECIAL_FORCES_CAP_BASE = 0.1								--特种部队基础上限
 NDefines.NCountry.SPECIAL_FORCES_CAP_MIN = 48								--特种部队基础下限营
-	
-	
-	
\ No newline at end of file
+NDefines.NAI.WANTED_UNITS_INDUSTRY_FACTOR = 5.0						--国家期望部队数量的计算基准：可用军工产能比例
+NDefines.NAI.WANTED_UNITS_THREAT_BASE = 2.0						--无威胁状态下，最小期望部队数将乘以此系数
+NDefines.NAI.WANTED_UNITS_THREAT_MAX = 20						--标准化威胁值上限（超出此值将按此值计算)
+NDefines.NAI.WANTED_UNITS_MAX_WANTED_CAP = 3000						--一个国家所需的最大师团数量。此数值可能因某些硬编码倍率而超出，但不会因基础计算逻辑而突破
+NDefines.NAI.CANCEL_COMBAT_MIN_DURATION_HOURS = 4						--仅当战斗持续至少<数值>小时后，方可取消（常规）战斗
+NDefines.NAI.MIN_FIELD_STRENGTH_TO_BUILD_UNITS = 0.6						--若当前兵力强度低于此阈值，则取消单位生产以将资源调配至前线部队
+NDefines.NAI.MIN_MANPOWER_TO_BUILD_UNITS = 0.5						--若当前人力水平低于此阈值，则取消单位生产以将资源调配至现役部队
+NDefines.NAI.ARMY_LEADER_ASSIGN_KEEP_CURRENT_LEADER_FACTOR = 3.0						--提升保留当前指挥官的评分权重。数值 > 1.0 表示偏向维持现任指挥官
+NDefines.NAI.ARMY_LEADER_ASSIGN_DONT_STEAL_OTHER_FACTOR = 0.3						--降低调用其他部队指挥官的评分权重。数值 < 1.0 表示不鼓励重新调配已任职的指挥官
+NDefines.NAI.AIFC_UPDATE_FREQUENCY_DAYS = 10						--AI 执行部队集结逻辑的频率。降低此值可能影响性能(原版为5)
+NDefines.NProduction.RESOURCE_PENALTY_WARNING_CRITICAL_RATIO = 100             -- 单位煤炭可转化能源量（原9）
+NDefines.NProduction.BASE_COUNTRY_ENERGY_PRODUCTION = 200            -- 国家基础能源产量（原10）
+NDefines.NProduction.ENERGY_SCALING_COST_BY_FACTORY_COUNT = 0.01            -- 根据工厂总数调整能源成本（原0.0225）
+NDefines.NProduction.BASE_ENERGY_COST = 0.1            -- 单座工厂的基础能耗（原0.25）
\ No newline at end of file
diff --git a/src/common/ideas/_economic.txt b/src/common/ideas/_economic.txt
index 9cf1cad..b4079b5 100755
--- a/src/common/ideas/_economic.txt
+++ b/src/common/ideas/_economic.txt
@@ -377,44 +377,10 @@ ideas = {
 
    				modifier = {
 					factor = 20
-
+					not = { has_idea = war_economy }
+					not = { has_idea = tot_economic_mobilisation }
 					is_major = yes
 				}
-				
-				modifier = {
-					add = 80
-					original_tag = SOV
-					date < 1937.1.1
-					NOT = { 
-						OR = {
-							has_idea = war_economy 
-							has_idea = tot_economic_mobilisation
-						}
-					}
-				}
-				
-				modifier = {
-					original_tag = SIA
-					NOT = { 
-						OR = {
-							has_idea = war_economy 
-							has_idea = tot_economic_mobilisation
-						}
-					}
-					add = 1200 #Prep for invasion
-				}
-
-				modifier = {
-					factor = 100
-					OR = {
-						original_tag = URG
-						original_tag = PAR
-					}
-					NOT = {
-						has_idea = war_economy
-					}
-					has_completed_focus = GUAY_coup_detat
-				}
    			}
 		}
 
@@ -564,55 +530,11 @@ ideas = {
 				}
 			}
 			ai_will_do = {
-   				base = 3
+   				base = 100
 
 				modifier = {
-					#High prio on production
-					factor = 20
-					manpower_per_military_factory >  1000
-				}
-
-				modifier = {
-					# If we CAN go for total mobilization and have enough manpower for it, skip war economy, it's only a waste of PP
 					factor = 0
-
-					manpower_per_military_factory > 15000
-					has_war = yes
-					has_war_support > 0.8
-					any_enemy_country = {
-						ic_ratio = {
-							tag = ROOT
-							ratio > 0.5
-						}
-					}
-				}
-
-				modifier = {
-					add = 1800
-
-					# revert from closed_economy if we have large allies
-					has_idea = closed_economy
-					has_large_ally_not_pick_closed_economy = yes
-				}
-
-				modifier = {
-					# We will lose the war support after the war anyway
-					factor = 0
-					original_tag = GER
-					has_civil_war = yes
-					has_government = neutrality
-				}
-
-				modifier = {
-					# They will take the focus to gain this for free, so they shouldn't spend pp on it too willy-nilly 
-					factor = 0.5
-					original_tag = JAP
-					OR = {
-						is_historical_focus_on = yes
-						has_country_flag = JAP_AI_RANDOM_FASCIST
-						has_country_flag = JAP_AI_RANDOM_NEUTRALITY
-					}
-
+					has_idea = tot_economic_mobilisation
 				}
    			}
 		}
@@ -735,19 +657,7 @@ ideas = {
 				}
 			}
 			ai_will_do = {
-   				base = 1
-
-				modifier = {
-					factor = 25
-					#Prio this if nation has a lot of manpower compared to MIC
-					manpower_per_military_factory > 15000
-				}
-
-				modifier = {
-					#Block  unless nation has a lot of manpower
-					factor = 0
-					manpower_per_military_factory <  10000
-				}
+   				base = 1000
 
 
 				modifier = {
@@ -758,31 +668,7 @@ ideas = {
 						has_idea = limited_conscription
 					}
 				}
-
-				# Germany needs to be careful
-				modifier = {
-					factor = 0
-
-					tag = GER
-					NOT = { has_doctrine = last_stand }
-					has_war = yes
-					date < 1944.01.01
-				}
-				modifier = {
-					factor = 0
-
-					tag = SOV
-					has_war = yes
-					OR = {
-						has_manpower < 2000000
-						NOT = {
-							OR = {
-								has_idea = all_adults_serve
-								has_idea = service_by_requirement
-							}
-						}
-					}
-				}
+				
    			}
 
 			cost = 150
diff --git a/src/common/ideas/tianjiang.txt b/src/common/ideas/tianjiang.txt
index 09fff40..fe26e8e 100755
--- a/src/common/ideas/tianjiang.txt
+++ b/src/common/ideas/tianjiang.txt
@@ -6,7 +6,7 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				country_resource_coal = 300
+				country_resource_coal = 500
 				factory_energy_consumption = -0.1
 				new_convoy_raiding_mastery_gain_factor = 10
 				new_fleet_in_being_mastery_gain_factor = 10
@@ -20,6 +20,16 @@ ideas = {
 				new_mobile_warfare_mastery_gain_factor = 10
 			}
 		}
+		az_meitanzuobi = {
+
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				country_resource_coal = 500
+				factory_energy_consumption = -0.1
+			}
+		}
 	}
 	# 天降独有民族精神，防覆盖
 	country = {
diff --git a/src/common/ideas/tix.txt b/src/common/ideas/tix.txt
index a7d9414..11b4025 100755
--- a/src/common/ideas/tix.txt
+++ b/src/common/ideas/tix.txt
@@ -585,13 +585,12 @@ ideas = {
 			}			
 			modifier = {
 				supply_consumption_factor = -0.1
-				supply_factor = 0.1
 			}
 			targeted_modifier = {
 				tag = BFL
 				attack_bonus_against = 0.3
 				defense_bonus_against = 0.3
-				breakthrough_bonus_against = 0.1
+				breakthrough_bonus_against = 0.2
 			}
 		}
 		TIX_ggdyh = {
diff --git a/src/common/ideologies/00_ideologies.txt b/src/common/ideologies/00_ideologies.txt
index 3f6c553..f04c83f 100755
--- a/src/common/ideologies/00_ideologies.txt
+++ b/src/common/ideologies/00_ideologies.txt
@@ -67,7 +67,7 @@ ideologies = {
 			faction_trade_opinion_factor = 0.50 #plus 50% trade opinion
 		}
 		ai_democratic = yes # uses the democratic AI behaviour
-		ai_ideology_wanted_units_factor = 2
+		ai_ideology_wanted_units_factor = 3
 		ai_give_core_state_control_threshold = 0 # Extra threshold value added to DIPLOMATIC_ACTION_PROPOSE_SCORE for this ideology to give back core state control to other country
 	}
 
@@ -113,7 +113,7 @@ ideologies = {
 		faction_impact_on_world_tension = 0.5
 		
 		ai_communist = yes # uses the commie AI behaviour
-		ai_ideology_wanted_units_factor = 2
+		ai_ideology_wanted_units_factor = 3
 		
 		rules = {
 			can_force_government = no
@@ -199,7 +199,7 @@ ideologies = {
 		}
 
 		ai_fascist = yes # uses the fascist AI behaviour
-		ai_ideology_wanted_units_factor = 2
+		ai_ideology_wanted_units_factor = 8
 		ai_give_core_state_control_threshold = 10000
 	}
 	
diff --git a/src/common/national_focus/donghuang_new.txt b/src/common/national_focus/donghuang_new.txt
index 629a1f0..dfcd781 100755
--- a/src/common/national_focus/donghuang_new.txt
+++ b/src/common/national_focus/donghuang_new.txt
@@ -6881,13 +6881,15 @@ focus_tree = {
 			focus = DOH_hailufuhe
 		}
 		available = {
+			always = no
 			num_of_factories > 900
 		}
 		cost = 2
 		x = -2
 		y = 2
 		completion_reward = {
-			custom_effect_tooltip = DOH_junmingronghe_duiwaishuchu_tooltip
+			custom_effect_tooltip = "（还没做完）"
+			#custom_effect_tooltip = DOH_junmingronghe_duiwaishuchu_tooltip
 		}
 	}
 	focus = {
diff --git a/src/common/national_focus/tiexue.txt b/src/common/national_focus/tiexue.txt
index 5338d4d..9992548 100755
--- a/src/common/national_focus/tiexue.txt
+++ b/src/common/national_focus/tiexue.txt
@@ -541,6 +541,9 @@ focus_tree = {
 		}
 		relative_position_id = TIX_rengongzhineng
 		cost = 10
+		available = {
+			is_puppet = no
+		}
 		ai_will_do = {
 			factor = 5
 		}
@@ -596,6 +599,9 @@ focus_tree = {
 		}
 		relative_position_id = TIX_rengongzhineng
 		cost = 10
+		available = {
+			is_puppet = no
+		}
 		ai_will_do = {
 			factor = 0
 		}
diff --git a/src/common/on_actions/az_waring_on_actions.txt b/src/common/on_actions/az_waring_on_actions.txt
index 4d2ca41..02a416a 100755
--- a/src/common/on_actions/az_waring_on_actions.txt
+++ b/src/common/on_actions/az_waring_on_actions.txt
@@ -255,6 +255,29 @@ on_actions = {
 			}
 		}
 	}
+	on_startup = {
+		effect = {
+			every_country = {
+				limit = {
+					OR = {
+						tag = BYG
+						tag = HUJ
+						tag = TIX
+						tag = SAD
+						tag = BFL
+						tag = YUW
+						tag = DOH
+						tag = CHY
+						tag = BLI
+						tag = SIR
+						tag = DH1
+					}
+					is_ai = no
+				}
+				add_ideas = az_meitanzuobi
+			}
+		}
+	}
 	on_startup = {
 		effect = {
 			SHO = {
@@ -281,7 +304,7 @@ on_actions = {
 	}
 	on_capitulation = { 
 		effect = {
-			if = {
+	if = {
 				limit = { 
 					date > 1941.6.1
 					tag = TIX
@@ -297,7 +320,7 @@ on_actions = {
 					surrender_progress < 0.4
 					}
 					HUJ = {
-					surrender_progress < 0.3
+					surrender_progress < 0.4
 					}
 					BYG = {
 					surrender_progress < 0.1
@@ -319,14 +342,6 @@ on_actions = {
 				white_peace = { 
 					tag = SAD
 				}
-				TIX_z23 = {
-					set_nationality = TIX
-				}
-				BFL = {
-					TIX_z23 = {
-						set_nationality = TIX
-					}
-				}
 				set_cosmetic_tag = TIX
 				TIX = {
 				add_country_leader_role = {
@@ -426,6 +441,7 @@ on_actions = {
 		set_demilitarized_zone = yes
 		}
 		BFL = {
+		country_event = { id = az_tianjiang.413 days = 1 }
 		#annex_country = { target = FIN transfer_troops = no }
 		annex_country = { target = UKR transfer_troops = no }
 		annex_country = { target = LAT transfer_troops = no }
@@ -481,8 +497,8 @@ on_actions = {
 		}
 		add_popularity = { ideology = communism popularity = 0.75 }
 		news_event = { id = az_tianjiang.89 days = 1}
-		} 
-		
+		country_event = { id = az_tianjiang.414 days = 1 }
+	} 
 		}
 	}
 	on_capitulation = {
diff --git a/src/common/scripted_effects/az_scripted_effects.txt b/src/common/scripted_effects/az_scripted_effects.txt
index 674dbd0..9d5cba5 100755
--- a/src/common/scripted_effects/az_scripted_effects.txt
+++ b/src/common/scripted_effects/az_scripted_effects.txt
@@ -1,7 +1,8 @@
-getzhg_event_gerentezhi_se = {SOV
+getzhg_event_gerentezhi_se = {
 	custom_effect_tooltip = getzhg_event_gerentezhi_tt
 	if = {
 		limit = { is_navy_leader = yes }
+		hidden_effect {
 		add_random_trait = { 
 			search_pattern_expert
 			gentlemanly
@@ -17,8 +18,10 @@ getzhg_event_gerentezhi_se = {SOV
 			naval_lineage
 			navy_media_personality
 		}
+		}
 	}
 	else = {
+		hidden_effect {
 		add_random_trait = { 
 			#substance_abuser
 			#substance_addict
@@ -33,18 +36,20 @@ getzhg_event_gerentezhi_se = {SOV
 			#media_personality
 			harsh_leader 
 			bearer_of_artillery	
-			infantry_officer
-			cavalry_officer
-			armor_officer
+			#infantry_officer
+			#cavalry_officer
+			#armor_officer
 			brave
 			engineer_officer
 		}
+		}
 	}	
 }
 getzhg_event_xidetezhi_se = {
 	custom_effect_tooltip = getzhg_event_xidetezhi_tt
 	if = {
 		limit = { is_navy_leader = yes }
+		hidden_effect {
 		add_random_trait = { 
 			seawolf
 			fleet_protector
@@ -55,8 +60,10 @@ getzhg_event_xidetezhi_se = {
 			air_controller
 			ironside
 		}
+		}
 	}
 	else = {
+		hidden_effect {
 		add_random_trait = { 
 			organizer
 			cavalry_leader
@@ -68,20 +75,24 @@ getzhg_event_xidetezhi_se = {
 			commando
 			naval_invader
 		}
+		}
 	}	
 }
 getzhg_event_dixingtezhi_se = {
 	custom_effect_tooltip = getzhg_event_dixingtezhi_tt
 	if = {
 		limit = { is_navy_leader = yes }
+		hidden_effect {
 		add_random_trait = { 
 			inshore_fighter
 			green_water_expert
 			blue_water_expert
 			arctic_water_expert
 		}
+		}
 	}
 	else = {
+		hidden_effect {
 		add_random_trait = { 
 			desert_fox
 			swamp_fox
@@ -92,6 +103,7 @@ getzhg_event_dixingtezhi_se = {
 			urban_assault_specialist
 			winter_specialist
 		}
+		}
 	}	
 }
 SIR_buffshangsheng = {
diff --git a/src/common/state_category/city.txt b/src/common/state_category/city.txt
new file mode 100755
index 0000000..c684039
--- /dev/null
+++ b/src/common/state_category/city.txt
@@ -0,0 +1,8 @@
+state_categories={
+	city = {
+		local_building_slots = 12
+	
+		color = { 0 200 0 }
+
+	}
+}
\ No newline at end of file
diff --git a/src/common/state_category/enclave.txt b/src/common/state_category/enclave.txt
new file mode 100755
index 0000000..70b928d
--- /dev/null
+++ b/src/common/state_category/enclave.txt
@@ -0,0 +1,7 @@
+state_categories={
+	enclave = {
+		local_building_slots = 0
+
+		color = { 40 40 40 }
+	}
+}
diff --git a/src/common/state_category/large_city.txt b/src/common/state_category/large_city.txt
new file mode 100755
index 0000000..5ba130e
--- /dev/null
+++ b/src/common/state_category/large_city.txt
@@ -0,0 +1,7 @@
+state_categories={
+	large_city = {
+		local_building_slots = 16
+	
+		color = { 0 240 0 }
+	}
+}
diff --git a/src/common/state_category/large_town.txt b/src/common/state_category/large_town.txt
new file mode 100755
index 0000000..b1dfa59
--- /dev/null
+++ b/src/common/state_category/large_town.txt
@@ -0,0 +1,8 @@
+state_categories={
+	large_town = {
+		local_building_slots = 10
+	
+		color = { 240 240 0 }
+
+	}
+}
\ No newline at end of file
diff --git a/src/common/state_category/megalopolis.txt b/src/common/state_category/megalopolis.txt
new file mode 100755
index 0000000..3452318
--- /dev/null
+++ b/src/common/state_category/megalopolis.txt
@@ -0,0 +1,8 @@
+state_categories={
+	megalopolis = {
+		local_building_slots = 24
+	
+			color = { 0 240 240 }
+
+	}
+}
diff --git a/src/common/state_category/metropolis.txt b/src/common/state_category/metropolis.txt
new file mode 100755
index 0000000..fcf2481
--- /dev/null
+++ b/src/common/state_category/metropolis.txt
@@ -0,0 +1,9 @@
+state_categories={
+	metropolis = {
+		local_building_slots = 20
+		
+		
+		
+		color = { 0 200 200 }
+	}
+}
diff --git a/src/common/state_category/pastoral.txt b/src/common/state_category/pastoral.txt
new file mode 100755
index 0000000..1ddbcb5
--- /dev/null
+++ b/src/common/state_category/pastoral.txt
@@ -0,0 +1,8 @@
+state_categories={
+	pastoral = {
+		local_building_slots = 2
+	
+		color = { 160 160 0 }
+
+	}
+}
diff --git a/src/common/state_category/rural.txt b/src/common/state_category/rural.txt
new file mode 100755
index 0000000..ed9fc1f
--- /dev/null
+++ b/src/common/state_category/rural.txt
@@ -0,0 +1,8 @@
+state_categories={
+	rural = {
+		local_building_slots = 4
+	
+		color = { 240 160 0 }
+
+	}
+}
\ No newline at end of file
diff --git a/src/common/state_category/small_island.txt b/src/common/state_category/small_island.txt
new file mode 100755
index 0000000..b2bd28a
--- /dev/null
+++ b/src/common/state_category/small_island.txt
@@ -0,0 +1,7 @@
+state_categories={
+	small_island = {
+		local_building_slots = 2
+	
+		color = { 200 160 0 }
+	}
+}
diff --git a/src/common/state_category/tiny_island.txt b/src/common/state_category/tiny_island.txt
new file mode 100755
index 0000000..961723a
--- /dev/null
+++ b/src/common/state_category/tiny_island.txt
@@ -0,0 +1,7 @@
+state_categories={
+	tiny_island = {
+		local_building_slots = 0
+	
+			color = { 40 40 40 }
+	}
+}
diff --git a/src/common/state_category/town.txt b/src/common/state_category/town.txt
new file mode 100755
index 0000000..221d1fa
--- /dev/null
+++ b/src/common/state_category/town.txt
@@ -0,0 +1,8 @@
+state_categories={
+	town = {
+		local_building_slots = 8
+	
+		color = { 200 200 0 }
+
+	}
+}
\ No newline at end of file
diff --git a/src/common/state_category/wasteland.txt b/src/common/state_category/wasteland.txt
new file mode 100755
index 0000000..093bae7
--- /dev/null
+++ b/src/common/state_category/wasteland.txt
@@ -0,0 +1,8 @@
+state_categories={
+	wasteland = {
+		local_building_slots = 0
+	
+		color = { 40 40 40 }
+
+	}
+}
diff --git a/src/common/unit_leader/az_traits.txt b/src/common/unit_leader/az_traits.txt
index b9cd306..1cc0647 100755
--- a/src/common/unit_leader/az_traits.txt
+++ b/src/common/unit_leader/az_traits.txt
@@ -706,8 +706,8 @@ leader_traits = {
 			reassignment_duration_factor = -0.8
 			sickness_chance = -1
 			wounded_chance_factor = -1
-			experience_gain_factor = 0.33
-			terrain_trait_xp_gain_factor = 1
+			experience_gain_factor = 2
+			terrain_trait_xp_gain_factor = 2
 		}
 		enable_ability = probing_attack
 		enable_ability = extra_suplies
diff --git a/src/events/AZ_tianjiangEvents.txt b/src/events/AZ_tianjiangEvents.txt
index 3f8cc24..190e9c2 100755
--- a/src/events/AZ_tianjiangEvents.txt
+++ b/src/events/AZ_tianjiangEvents.txt
@@ -2583,6 +2583,7 @@ news_event = {
 		ALB = {
 		transfer_state = 44
 		transfer_state = 805
+		transfer_state = 934
 		}
 		ai_chance = {
 			factor = 100
@@ -2621,6 +2622,7 @@ country_event = {
 		ALB = {
 		transfer_state = 44
 		transfer_state = 805
+		transfer_state = 934
 		}
 		hidden_effect = {
 		news_event = { id = az_tianjiang.80 days = 1}
@@ -5425,6 +5427,7 @@ country_event = {
 		transfer_state = 670
 		transfer_state = 286
 		transfer_state = 741
+		transfer_state = 1017
 		}
 		DOH = {
 		transfer_state = 609
@@ -5442,6 +5445,11 @@ country_event = {
 		transfer_state = 527
 		transfer_state = 525
 		transfer_state = 728
+		transfer_state = 1043
+		transfer_state = 1028
+		transfer_state = 1029
+		transfer_state = 1030
+		transfer_state = 1031
 		}
 		hidden_effect = {
 		news_event = { id = az_tianjiang.143 days = 1}
@@ -8152,6 +8160,7 @@ country_event = {
 		date > 1936.1.3
 		tag = HUJ
 		is_ai = yes
+		always = no	#再试试
 	}
 	fire_only_once = yes
 	option = {
@@ -13451,4 +13460,203 @@ country_event = {
 		name = "我想在正常模式下体验全词条的自选BUFF！"
 		add_ideas = AZ_mztz_rwkk_idea
 	}
+}
+
+country_event = {
+	id = az_tianjiang.413
+	title = "与尼米酱的合作"
+	desc = "铁血的Z23愿意与我们合作，共同建设美好的新铁血。"
+	picture = GFX_aze_dai
+	is_triggered_only = yes
+	option = {
+		name = "这是好事啊"
+		TIX_z23 = {
+			set_nationality = TIX
+		}
+		TIX = {
+			add_country_leader_role = {
+				Character = TIX_z23
+				Promote_leader = yes
+				Country_leader = {
+					ideology = leninism
+					expire = "2000.1.1.1"
+					traits = {
+						jjdxxs
+						}
+					}
+				}
+		}
+		ai_chance = {
+			base = 100
+		}
+	}
+}
+
+country_event = {
+	id = az_tianjiang.414
+	title = "撒丁的末路"
+	desc = "在我们投降之后，撒丁也濒临崩溃。"
+	picture = GFX_aze_dai
+	is_triggered_only = yes
+	option = {
+		name = "AI用事件"
+		if = {
+			limit = {
+				IRQ = {
+					has_government = fascism
+					is_subject = no
+				}
+			}
+			HUJ = {
+				set_autonomy = {
+					target = IRQ
+					autonomy_state = autonomy_integrated_puppet
+				}
+			}
+		}
+		if = {
+			limit = {
+				PRU = {
+					has_government = fascism
+					is_subject = no
+				}
+			}
+			BYG = {
+				set_autonomy = {
+					target = PRU
+					autonomy_state = autonomy_integrated_puppet
+				}
+			}
+		}
+		if = {
+			limit = {
+				VEN = {
+					has_government = fascism
+					is_subject = no
+				}
+			}
+			BYG = {
+				set_autonomy = {
+					target = VEN
+					autonomy_state = autonomy_integrated_puppet
+				}
+			}
+		}
+		if = {
+			limit = {
+				DOM = {
+					has_government = fascism
+					is_subject = no
+				}
+			}
+			BYG = {
+				set_autonomy = {
+					target = DOM
+					autonomy_state = autonomy_integrated_puppet
+				}
+			}
+		}
+		if = {
+			limit = {
+				ELS = {
+					has_government = fascism
+					is_subject = no
+				}
+			}
+			BYG = {
+				set_autonomy = {
+					target = ELS
+					autonomy_state = autonomy_integrated_puppet
+				}
+			}
+		}
+		if = {
+			limit = {
+				SAD = {
+					is_ai = yes
+					has_government = fascism
+					has_capitulated = no
+					is_subject = no
+				}
+				not = { country_exists = ITA }
+			}
+			SAD = {
+				country_event = { id = az_tianjiang.415 days = 1 }
+				release_on_controlled = YUG
+				release_on_controlled = BUL
+				release_on_controlled = ALB
+				release_on_controlled = GRE
+				ALB = {
+					transfer_state = 44
+					transfer_state = 805
+					transfer_state = 934
+				}
+				retire_character = SAD_tuolichaili
+				ITA = {
+					set_politics = {
+						ruling_party = democratic
+					}
+				transfer_state = 115
+				transfer_state = 156
+				transfer_state = 117
+				transfer_state = 157
+				transfer_state = 2
+				transfer_state = 114
+				transfer_state = 849
+				}
+				ITA = {
+					add_popularity = { ideology = democratic popularity = 0.75 }
+					load_oob = ITA_1939_nsb
+					every_state = {
+						limit = {
+							is_core_of = SAD
+							}
+						add_core_of = ITA
+					}
+				}
+					HUJ = {
+						country_event = { id = az_tianjiang.82 days = 5 }
+						transfer_state = 177
+						transfer_state = 183
+					}
+					BFL = {
+						country_event = { id = az_tianjiang.82 days = 5 }
+						}
+			}
+		}
+		ai_chance = {
+			base = 100
+		}
+	}
+}
+
+country_event = {
+	id = az_tianjiang.415
+	title = "共和派发起内战"
+	desc = "随着铁血战败，我们也岌岌可危。"
+	picture = GFX_aze_dai
+	is_triggered_only = yes
+	option = {
+		name = "不可能！"
+		declare_war_on = { target = BFL type = annex_everything }
+		declare_war_on = { target = HUJ type = annex_everything }
+		declare_war_on = { target = ITA type = annex_everything }
+		ITA = {
+			recruit_character = SAD_tuolichaili
+			add_country_leader_role = {
+				character = SAD_tuolichaili
+				promote_leader = yes
+				country_leader = {
+					expire = "4999.1.1"
+					ideology = liberalism
+					traits = {
+
+					}
+				}
+			}
+		}
+		ai_chance = {
+			base = 100
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/events/DOH_shijian.txt b/src/events/DOH_shijian.txt
index 5f00056..24e77dc 100755
--- a/src/events/DOH_shijian.txt
+++ b/src/events/DOH_shijian.txt
@@ -951,6 +951,19 @@ country_event = {
 				} 
 			}
 		}
+		if = {
+			limit = {
+				KUM = { exists = yes }
+			}
+			annex_country = { target = KUM transfer_troops = yes }
+			KUM = { 
+				DOH = { 
+					country_event = DOH_event.29
+					add_to_variable = { tunbingjunfa_costpp = -100 }
+					add_to_variable = { tunbingjunfa_shuliang = 1 }
+				} 
+			}
+		}
 	}
 
 }
diff --git a/src/gfx/interface/stateview/stateview_bg - Copy.dds b/src/gfx/interface/stateview/stateview_bg - Copy.dds
new file mode 100755
index 0000000..5a6b6b4
Binary files /dev/null and b/src/gfx/interface/stateview/stateview_bg - Copy.dds differ
diff --git a/src/gfx/interface/stateview/stateview_bg.dds b/src/gfx/interface/stateview/stateview_bg.dds
new file mode 100755
index 0000000..5a6b6b4
Binary files /dev/null and b/src/gfx/interface/stateview/stateview_bg.dds differ
diff --git a/src/gfx/interface/stateview/ww_stateview_bg.dds b/src/gfx/interface/stateview/ww_stateview_bg.dds
new file mode 100755
index 0000000..41fa9d2
Binary files /dev/null and b/src/gfx/interface/stateview/ww_stateview_bg.dds differ
diff --git a/src/gfx/interface/stateview_bg.dds b/src/gfx/interface/stateview_bg.dds
new file mode 100755
index 0000000..9616de8
Binary files /dev/null and b/src/gfx/interface/stateview_bg.dds differ
diff --git a/src/history/countries/TIX - Tiexue.txt b/src/history/countries/TIX - Tiexue.txt
index 331a459..258ee41 100755
--- a/src/history/countries/TIX - Tiexue.txt	
+++ b/src/history/countries/TIX - Tiexue.txt	
@@ -348,27 +348,6 @@ if = {
 		icon = "gfx/interface/technologies/ger_basic_light_tank.dds"
 		obsolete = yes
 	}
-	create_equipment_variant = {
-		name = "Neubaufahrzeug"
-		type = heavy_tank_chassis_1
-		parent_version = 0
-		modules = {
-			main_armament_slot = tank_close_support_gun
-			turret_type_slot = tank_heavy_three_man_tank_turret
-			suspension_type_slot = tank_bogie_suspension
-			armor_type_slot = tank_riveted_armor
-			engine_type_slot = tank_gasoline_engine
-			special_type_slot_1 = tank_radio_1
-			special_type_slot_2 = secondary_turret_hmg
-			special_type_slot_3 = secondary_turret_hmg
-			special_type_slot_4 = secondary_turret_hmg
-		}
-		upgrades = {
-			tank_nsb_engine_upgrade = 6
-			tank_nsb_armor_upgrade = 2
-		}
-		icon = "gfx/interface/technologies/ger_basic_heavy_tank.dds"
-	}
 	create_equipment_variant = {
 		name = "Panzer II Ausf. a"
 		type = light_tank_chassis_2
diff --git a/src/interface/countrystateview.gui b/src/interface/countrystateview.gui
new file mode 100755
index 0000000..3a07b29
--- /dev/null
+++ b/src/interface/countrystateview.gui
@@ -0,0 +1,756 @@
+guiTypes = {
+
+	containerWindowType = {
+		name = "claim_entry"
+		
+		buttonType = {
+			name = "claim_flag"
+			position = { x = 0 y = 0 }
+			quadTextureSprite ="GFX_flag_small"
+			Orientation = "LOWER_LEFT"
+		}	
+	}
+	
+	positionType = {
+		name = "countrystateview_weathericons_position"
+		position = { x = 384 y= -31 }
+	}
+
+	positionType = {
+		name = "countrystateview_weathericons_offset"
+		position = { x = -40 y = 0 }
+	}
+	
+	containerWindowType = {
+		name = "countrystateview"
+		position = { x=-416 y=-885}
+		show_position = { x=-6 y =-855 }
+		show_animation_type = decelerated
+		hide_animation_type = accelerated
+		animation_time = 300
+		orientation = lower_left
+		size = { width=436 height=881 }
+		
+		containerWindowType = {
+			name = "state_info_window"
+			position = { x = 0 y = 0 }
+			size = { width=780 height=696 }
+			
+			
+			background = {
+				name = "Background"
+				quadTextureSprite = "GFX_ww_stateview_bg"
+				position = { x = 5 y = 5 }
+			}
+						
+			instantTextboxType = {
+				name = "state_name"
+				position = { x = 60 y = 5 }
+				textureFile = ""
+				font = "hoi_36header"
+				text = "STATE_NAME_TEST"
+				maxWidth = 330
+				maxHeight = 30
+				format = center
+			}
+			
+			gridBoxType = {
+				name = "state_building_entries"
+				position = { x = 155 y = 45 }
+				size = { width = 480 height = 105 }
+				format = "UPPER_LEFT"
+				slotsize = { width = 60 height = 52 }
+				max_slots_horizontal = 5
+				max_slots_vertical = 1
+			}
+			
+			instantTextboxType = {
+				name = "shared_slot_count"
+				position = { x = 194 y = 147 }
+				textureFile = ""
+				font = "hoi_18mbs"
+				text = "SLOTS"
+				maxWidth = 190
+				maxHeight = 30
+				format = left
+				fixedsize = yes
+			}
+			
+			gridBoxType = {
+				name = "state_shared_slot_building_entries"
+				position = { x = 162 y = 168 }
+				size = { width = 480 height = 90%% }
+				format = "UPPER_LEFT"
+				slotsize = { width = 58 height = 46 }
+				max_slots_horizontal = 5
+				max_slots_vertical = 10
+			}
+
+			iconType ={
+				name ="victory_points_bg"
+				spriteType = "GFX_victorypoint_stateview_bg"
+				position = { x = 17 y = 12 }
+			}
+			
+			instantTextboxType = {
+				name = "victory_points"
+				position = { x = -13 y = 15 }
+				textureFile = ""
+				font = "hoi_18mbs"
+				text = ""
+				maxWidth = 70
+				maxHeight = 30
+				format = right
+			}
+			
+			instantTextboxType = {
+				name = "claims"
+				position = { x = 15 y = 97 }
+				textureFile = ""
+				font = "hoi_18mbs"
+				text = ""
+				maxWidth = 140
+				maxHeight = 30
+				fixedsize = yes
+				format = center				
+			}
+			
+			OverlappingElementsBoxType = {
+				name = "state_claims"
+				position = { x = 35 y = 118 }
+				size = { x = 110 y = 40 }
+				format = left
+				spacing = 1.0
+			}
+			
+			instantTextboxType = {
+				name = "owner"
+				position = { x = 15 y = 42 }
+				textureFile = ""
+				font = "hoi_18mbs"
+				text = ""
+				maxWidth = 140
+				maxHeight = 30
+				fixedsize = yes
+				format = center
+			}
+			
+			OverlappingElementsBoxType = {
+				name = "state_owners"
+				position = { x = 35 y = 63 }
+				size = { x = 60 y = 40 }
+				format = left
+				spacing = 1.0
+			}
+
+			positionType = {
+				name = "state_owners_size_when_owner_is_controller"
+				position = { x = 110 y = 40 }
+			}
+
+			positionType = {
+				name = "state_owners_size_when_owner_is_not_controller"
+				position = { x = 60 y = 40 }
+			}
+
+			buttonType = {
+				name = "controller_flag"
+				quadTextureSprite = "GFX_flag_small2"
+				position = { x= 74 y = 63 }
+			}	
+			
+			iconType ={
+				name ="controller_flag_border"
+				quadTextureSprite = "GFX_diplo_countrylist_flag_frame"
+				position = { x= 70 y = 59 }
+				alwaystransparent = yes
+			}
+			
+			containerWindowType = {
+				name = "state_resources"
+				position = { x= 26 y=355}
+				size = { width=135 height=123 }
+				
+				
+				background = {
+					name = "Resources_bg"
+					quadTextureSprite = "GFX_tiled_window_transparent_transparent"
+				}
+			
+				gridBoxType = {
+					name = "state_resources_entries"
+					position = { x = -42 y = -3 }
+					size = { width = 132 height = 120 }
+					format = "UPPER_LEFT"
+					slotsize = { width = 52 height = 30 }
+					max_slots_horizontal = 2
+					max_slots_vertical = 3
+					
+				}
+			}
+			
+			iconType ={
+				name ="population_icon"
+				spriteType = "GFX_population_icon"
+				position = { x = 20 y = 157 }
+				Orientation = "UPPER_LEFT"
+			}
+			
+			instantTextboxType = {
+				name = "manpower"
+				position = { x = 64 y = 167 }
+				textureFile = ""
+				font = "hoi_18mbs"
+				maxWidth = 80
+				maxHeight = 30
+				format = center	
+			}
+			
+			containerWindowType = {
+				name = "resistance_container"
+				position = { x = 20 y = 196}	
+				size = { width = 519 height = 100 }
+				
+				iconType ={
+					name ="state_resistance_icon"
+					spriteType = "GFX_resistance_icon"
+					position = { x = 0 y = 0 }
+				}
+				
+				positionType = {
+					name = "resistance_status_pos"
+					position = { x = 36 y = 6 }
+				}
+				
+				iconType ={
+					name ="state_compliance_icon"
+					spriteType = "GFX_compliance_icon"
+					position = { x = 0 y = 37 }
+				}
+				
+				positionType = {
+					name = "compliance_status_pos"
+					position = { x = 36 y = 38 }
+				}
+				
+				containerWindowType = {
+					name = "law_and_template_container"
+					position = { x = 0 y = 0}	
+					size = { width = 0 height = 0 }
+
+					buttonType = {
+						name = "select_law_button"
+						position = { x = 0 y = 68 }
+						quadTextureSprite = "GFX_occupation_state_select_law_button"
+						buttonFont = "hoi_18mbs"
+						Orientation = "UPPER_LEFT"
+					}
+
+					iconType = {
+						name ="select_law_icon"
+						spriteType = "GFX_occupation_policy_icon_strip"
+						position = { x = 2 y = 69 }
+						alwaystransparent = yes
+					}
+
+
+					buttonType = {
+						name = "template_garrison_button"	
+						position = { x = 34 y = 69 }	
+						spriteType = "GFX_unitlist_unitinfo_button_small"
+					}
+
+					instantTextBoxType = {
+						name ="template_need_text"
+						position = { x = 100 y = 75 }
+						font = "hoi_16mbs"
+						text = "42"
+						maxWidth = 57
+						maxHeight = 24
+					}
+
+					iconType = {
+						name = "template_garrison"
+						position = { x = 29 y = 63 }
+						spriteType = "GFX_locked_icon" # Will be replaced by the current template
+						alwaystransparent = yes
+					}
+				}
+			}
+		}
+		
+		containerWindowType = {
+			name = "province_info_window"
+			position = { x = 20 y = 742 }
+			size = { width=480 height=29%% }
+			
+			iconType = {
+				name = "terrain_picture"
+				position = { x =10 y=-27 }
+				spriteType = "GFX_terrain_default"
+				Orientation = "UPPER_LEFT"
+			}
+			
+			instantTextboxType = {
+				name = "province"
+				position = { x = 0 y= -50 }
+				font = "hoi_20b"
+				maxWidth = 300
+				maxHeight = 30
+				format = left
+			}
+
+			iconType = {
+				name = "province_required_rule"
+				position = { x = 100 y = -3 }
+				spriteType = "GFX_required_rule"
+				Orientation = "UPPER_LEFT"
+			}	
+
+			iconType = {
+				name = "building_modifiers_icon"
+				position = { x = 350 y= -102 }
+				spriteType = "GFX_buildings_strip"
+				Orientation = "UPPER_LEFT"
+				frame = 21
+				scale = 0.8
+				hide = yes
+			}
+			
+			### Positioning of these are controlled by the positionType "countrystateview_weathericons_position" and "countrystateview_weathericons_offset" above
+			iconType = {
+				name = "modifiers_mud_icon"
+				position = { x = 0 y= 0 }
+				spriteType = "GFX_modifiers_mud_icon"
+				Orientation = "UPPER_LEFT"
+			}
+			
+			iconType = {
+				name = "modifiers_snow_icons"
+				position = { x = 0 y= 0 }
+				spriteType = "GFX_modifiers_snow_icons"
+				Orientation = "UPPER_LEFT"
+				frame = 1
+			}
+
+			iconType = {
+				name = "modifiers_weather_icons"
+				position = { x = 0 y= 0 }
+				spriteType = "GFX_modifiers_weather_icons"
+				Orientation = "UPPER_LEFT"
+				frame = 1
+			}
+
+			iconType = {
+				name = "temperature_icons"
+				position = { x = 0 y= 0 }
+				spriteType = "GFX_temperature_icons"
+				Orientation = "UPPER_LEFT"
+				frame = 1				
+			}
+
+			iconType = {
+				name = "impassability_icon"
+				position = { x = 0 y= 0 }
+				spriteType = "GFX_impassable_icon"
+				Orientation = "UPPER_LEFT"
+			}
+
+			instantTextboxType = {
+				name = "state_modifiers"
+				text = "STATE_MODIFIERS"
+				position = { x = 40 y= -108 }
+				font = "hoi_16mbs"
+				maxWidth = 200
+				maxHeight = 30
+				format = left
+			}
+			
+			gridBoxType = {
+				name = "dynamic_modifiers_grid"
+				position = { x = 423 y = 71 }
+				size = { width = 0 height = 0 }
+				format = "LOWER_LEFT"
+				slotsize = { width = 40 height = 47 }
+				max_slots_vertical = 1
+			}
+			
+			gridBoxType = {
+				name = "strategic_locations_grid"
+				position = { x = 423 y = 133 }
+				size = { width = 0 height = 0 }
+				format = "LOWER_LEFT"
+				slotsize = { width = 40 height = 47 }
+				max_slots_vertical = 1
+			}
+			
+			containerWindowType = {
+				name = "custom_icon_container"
+				size = { width=100% height=100% }
+				position = { x = 0 y= 0 }
+
+				iconType = {
+					name = "flooded_icon"
+					spriteType = "GFX_modifiers_flooded_icon"
+					position = { x = 0 y = 0 }
+					Orientation = "UPPER_LEFT"			
+				}
+
+				iconType = {
+					name = "unplanned_offensive_icon"
+					spriteType = "GFX_modifiers_unplanned_offensive_icon"
+					position = { x = 0 y = 0 }
+					Orientation = "UPPER_LEFT"			
+				}
+
+				iconType = {
+					name = "the_great_wall_icon"
+					spriteType = "GFX_modifiers_the_great_wall_icon"
+					position = { x = 0 y = 0 }
+					Orientation = "UPPER_LEFT"			
+				}	
+			}
+
+			gridBoxType = {
+				name = "province_custom_icon_building_entries"
+				position = { x = 10 y = 5}
+				size = { width = 480 height = 40 }
+				format = "UPPER_LEFT"
+				slotsize = { width = 61 height = 84}
+				max_slots_vertical = 1
+			}
+			
+			gridBoxType = {
+				name = "province_building_entries"
+				position = { x = 0 y = 44 }
+				size = { width = 480 height = 90%% }
+				format = "UPPER_LEFT"
+				slotsize = { width = 61 height = 84 }
+				max_slots_horizontal = 7
+				max_slots_vertical = 1
+			}
+		}	
+		
+		buttonType = {
+			name = "close_button"
+			position = { x = -4 y = 11 }
+			quadTextureSprite ="GFX_closebutton_small"
+			buttonFont = "Main_14_black"
+			shortcut = "ESCAPE"
+			Orientation = "UPPER_RIGHT"
+			clicksound = click_close
+			pdx_tooltip = "CLOSE"
+		}
+
+		buttonType = {
+			name = "scorched_earth_state_button"
+			position = { x = -20 y = 640 }
+			quadTextureSprite ="GFX_scorched_earth_state"
+			buttonFont = "Main_14_black"
+			Orientation = "UPPER_RIGHT"
+		}
+	}
+	
+	windowType = {
+		name = "state_stakeholder_entry"
+		position = { x = 0 y = 0}	
+		size = { x = 40 y = 26 }
+
+		guibuttonType = {
+			name = "stakeholder_country_flag"
+			quadTextureSprite ="GFX_flag_small2"
+			position = { x= 0 y = 1 }
+			#Orientation = "UPPER_LEFT"
+		}
+		
+		iconType = {
+			name = "flag_border_thin"
+			quadTextureSprite = "GFX_small_flag_frame_thin"
+			position = { x= -2 y = -1 }
+			alwaystransparent = yes
+		}
+
+		iconType = {
+			name = "flag_border_thick"
+			quadTextureSprite = "GFX_diplo_countrylist_flag_frame"
+			position = { x= -5 y = -4 }
+			alwaystransparent = yes
+		}
+		
+		iconType = {
+			name = "flag_exclamation_mark"
+			spriteType = "GFX_alerts_category"
+			position = {x = 0 y = 0}
+			frame = 2
+			alwaystransparent = yes
+			scale = 0.8
+		}
+	}
+	
+	containerWindowType = {
+		name = "state_building_entry"
+		position = { x=0 y=0 }
+		size = { width=140 height= 70 }
+		clipping = no
+		
+		background = {
+			name = "Background"
+			spriteType ="GFX_ww_building_standing_entry_stateview"
+		}
+		
+		iconType = {
+			name = "level_bg"
+			position = { x=5 y=51 }	
+			spriteType = "GFX_generic_text_bg_48"
+		}
+		
+		instantTextboxType = {
+			name = "level"
+			position = { x = -1 y = 54 }
+			font = "hoi_20b"
+			maxWidth = 60
+			maxHeight = 20
+			format = center
+			alwaystransparent = yes
+		}
+		
+		buttonType = {
+			name = "building_picture"
+			position = { x = 12 y = 5 }
+			quadTextureSprite ="GFX_buildings_strip"
+		}
+		
+		iconType = {
+			name = "damage_bar"
+			spriteType = "GFX_damage_bar"
+			position = { x=10 y=41 }
+			rotation = 1.5708		
+		}	
+	}
+	
+	containerWindowType = {
+		name = "state_shared_slot_building_entry"
+		position = { x=0 y=0 }
+		size = { width=70 height= 70 }
+		clipping = no
+
+		iconType = {
+			name = "build_slot_bg"
+			position = { x=0 y=0 }	
+			spriteType = "GFX_build_slot_bg"
+			alwaystransparent = yes
+		}
+		
+		buttonType = {
+			name = "building_picture"
+			position = { x = 10 y = 0 }
+			quadTextureSprite = "GFX_buildings_strip"
+		}
+		
+		iconType = {
+			name = "building_status_overlay"
+			position = { x = 10 y = 0 }
+			quadTextureSprite = "GFX_building_status_overlay"
+			alwaystransparent = yes
+		}
+		
+		buttonType = {
+			name = "remove"
+			position = { x = 40 y = 29 }
+			spriteType = "GFX_cancel_conversion_button"
+		}
+		
+		iconType = {
+			name = "damage_bar"
+			spriteType = "GFX_damage_bar"
+			position = { x=7 y=36 }
+			rotation = 1.5708		
+		}	
+	}
+	
+	containerWindowType = {
+		name = "province_building_entry"
+		position = { x=0 y=0 }
+		size = { width=96 height= 50 }
+		clipping = no
+
+		background = {
+			name = "Background"
+			spriteType ="GFX_ww_building_standing_entry_stateview"
+		}
+		
+		iconType = {
+			name = "level_bg"
+			position = { x=5 y=50 }	
+			spriteType = "GFX_generic_text_bg_48"
+		}
+		
+		instantTextboxType = {
+			name = "level"
+			position = { x = -20 y = 52 }
+			font = "hoi_20b"
+			maxWidth = 100
+			maxHeight = 100
+			format = center
+			alwaystransparent = yes
+		}
+
+		buttonType = {
+			name = "building_picture"
+			position = { x = 10 y = 3 }
+			quadTextureSprite ="GFX_buildings_strip"
+		}
+		
+		iconType = {
+			name = "damage_bar"
+			spriteType = "GFX_damage_bar"
+			position = { x=9 y=42  }
+			rotation = 1.5708		
+		}
+	}
+
+	containerWindowType = {
+		name = "province_building_special_icon_entry"
+		position = { x=0 y=-10 }
+		size = { width=50 height= 43 }
+		clipping = no
+
+		background = {
+			name = "Background"
+			spriteType ="GFX_province_landmark_bg"
+		}
+
+		# Since the province building and facility icons are not the same size.
+		# For now use the position type X value as a scale, where 1 = 0.1 scale.
+		positionType = {
+			name = "facility_building_button_scale"
+			position = { x = 4 y = 0}
+		}
+
+		buttonType = {
+			name = "building_button"
+			quadTextureSprite = "GFX_placeholder_bg"
+			position = { x = 14 y = 7 }
+			scale = 1.0
+		}
+		
+		iconType = {
+			name = "damage_bar"
+			spriteType = "GFX_province_landmark_damage_bar"
+			position = { x=6 y=8  }
+		}
+	}
+	
+	containerWindowType = {
+		name = "state_resource_entry"
+		position = { x=0 y=0 }
+		size = { width=23 height= 27 }
+		clipping = no
+		
+		
+		iconType = {
+			name = "resource"
+			position = { x=50 y=10 }	
+			spriteType = "GFX_resources_strip"
+		}
+		
+		instantTextboxType = {
+			name = "amount"
+			position = { x = 66 y = 11 }
+			font = "hoi_20b"
+			maxWidth = 37
+			maxHeight = 18
+			format = center
+		}
+	}
+	
+	
+	containerWindowType = {
+		name = "state_compliance_status_container"
+		position = { x = 300 y = 40 }	
+		size = { width = 45 height = 31 }
+		
+		iconType = {
+			name = "bg"
+			spriteType = "GFX_occupation_state_compliance_bar_bg"
+			position = { x = 0 y = 0 }
+		}
+			
+		iconType = {
+			name = "progress"
+			spriteType = "GFX_occupation_state_compliance_bar"
+			position = { x = 3 y = 2 }
+			frame = 100
+		}
+		
+		instantTextBoxType = {
+			name ="progress_text"
+			position = { x = 4 y = 0 }
+			font = "hoi_18mbs"
+			text = "100%"
+			maxWidth = 80
+			format = center
+			alwaystransparent = yes
+		}
+	}
+	containerWindowType = {
+		name = "state_resistance_status_container"
+		position = { x = 300 y = 40 }	
+		size = { width = 45 height = 31 }
+		
+		iconType = {
+			name = "bg"
+			spriteType = "GFX_occupation_state_resistance_bar_bg"
+			position = { x = 0 y = 0 }
+		}
+			
+		iconType = {
+			name = "progress"
+			spriteType = "GFX_occupation_state_resistance_bar"
+			position = { x = 1 y = 2 }
+			frame = 100
+		}
+		
+		instantTextBoxType = {
+			name ="progress_text"
+			position = { x = 4 y = 0 }
+			font = "hoi_18mbs"
+			text = "100%"
+			maxWidth = 80
+			format = center
+			alwaystransparent = yes
+		}
+	}
+	
+	containerWindowType = {
+		name = "state_view_dynamic_modifier_entry"
+		size = { width = 40 height = 47 }
+		position = { x = -420 y = -120 }
+		clipping = no
+		
+		iconType = {
+			name = "icon"
+			quadTextureSprite ="GFX_idea_unknown"
+		}
+		
+		iconType = {
+			name = "flag"
+			position = { x = 18 y = 45 }
+			quadTextureSprite ="GFX_mapicon_unit_flag_stripe"
+			orientation = "UPPER_LEFT"
+		}
+	}
+	
+	containerWindowType = {
+		name = "province_view_strategic_location_entry"
+		size = { width = 40 height = 47 }
+		position = { x = -420 y = -100 }
+		clipping = no
+		
+		iconType = {
+			name = "icon"
+			quadTextureSprite ="GFX_idea_unknown"
+			scale = 0.8
+		}
+	}
+}
diff --git a/src/interface/countrytechtreeview.gui b/src/interface/countrytechtreeview.gui
index 0301f8c..8daad54 100755
--- a/src/interface/countrytechtreeview.gui
+++ b/src/interface/countrytechtreeview.gui
@@ -508,6 +508,12 @@ guiTypes = {
 				format = "LEFT"
 			}
 
+			gridboxtype = {
+				name = "rangers_tech_tree"
+				position = { x = 140 y = 1110 }
+				slotsize = { width = 70 height = 70 }
+				format = "LEFT"
+			}
 
 			gridboxtype = {
 				name = "tech_special_forces_tree"
diff --git a/src/localisation/simp_chinese/az_misc_l_simp_chinese.yml b/src/localisation/simp_chinese/az_misc_l_simp_chinese.yml
index b68f624..e6a0e95 100755
--- a/src/localisation/simp_chinese/az_misc_l_simp_chinese.yml
+++ b/src/localisation/simp_chinese/az_misc_l_simp_chinese.yml
@@ -1,6 +1,6 @@
 l_simp_chinese:
- gengxinshuoming_title2:0"2.14更新内容"
- gengxinshuoming_text2:"1.初步适配完成，疯狂AI暂未测试，部分系统改动较多，具体改动内容请看创意工坊改动说明。\n\n在正式开始游戏前，请确保已经开启了50建筑槽MOD，这会对MOD的游戏流程与AI行为有极大影响。\nMOD内95%的长文案由AI生成，§C所有文案当做同人小说来看就好§!！MOD交流群539127559\n最下方的决议里有路线指南和舰娘羁绊事件。出现成就条件满足但无法去完成的情况请打开历史国策。"
+ gengxinshuoming_title2:0"2.16更新内容"
+ gengxinshuoming_text2:"1.AI下兵更多，而且会造一些重坦师。\n2.舰娘国后期都不会缺煤炭了。\n\n§O已经整合50建筑槽MOD，无需再额外启动！！！§!\nMOD内95%的长文案由AI生成，§C所有文案当做同人小说来看就好§!！MOD交流群539127559\n最下方的决议里有路线指南和舰娘羁绊事件。出现成就条件满足但无法去完成的情况请打开历史国策。"
  az_openstart_button_tooltip:0"打开碧蓝MOD开始界面"
  dancingxiaotiancheng_tooltip:0"§RDancing~§! §CDancing~§! §YNon Stop§! §Bmy§! §GDancing~§!"
  az_start_mainwindow_stratgame_btn_tooltip:0"§Y◆注意◆§!确认你已完成所有MOD设定，点击开始游戏后将§R无法更改§!任何设定§Y◆注意◆§!"
@@ -356,7 +356,8 @@ modifier_production_cost_air_base_factor: "§Y空军基地§!建造花费"
 modifier_production_cost_air_base_factor_desc: "改变空军基地建造花费"
 modifier_production_cost_naval_base_factor: "§Y海军基地§!建造花费"
 modifier_production_cost_naval_base_factor_desc: "改变海军基地建造花费"
-az_aimeitanzuobi: "AI作弊"
+az_aimeitanzuobi: "舰娘国特殊能源"
 modifier_experience_gain_medium_armor_combat_factor: "战斗中获取的中坦经验："
 modifier_experience_gain_heavy_armor_combat_factor: "战斗中获取的重坦经验："
-shijianniangguojia_trigger_tooltip: "§Y[ROOT.getname]§!是舰娘国家"
\ No newline at end of file
+shijianniangguojia_trigger_tooltip: "§Y[ROOT.getname]§!是舰娘国家"
+az_meitanzuobi: "舰娘国特殊能源"
\ No newline at end of file
diff --git a/src/localisation/simp_chinese/azevent_l_simp_chinese.yml b/src/localisation/simp_chinese/azevent_l_simp_chinese.yml
index fbcb5d5..b4e4533 100755
--- a/src/localisation/simp_chinese/azevent_l_simp_chinese.yml
+++ b/src/localisation/simp_chinese/azevent_l_simp_chinese.yml
@@ -113,7 +113,7 @@
  az_ziyuanzhuanhua_wu_tooltip:0"魔方稳定产出§Y50§!钨资源"
  az_ziyuanzhuanhua_lv_tooltip:0"魔方稳定产出§Y70§!铝资源"
  az_ziyuanzhuanhua_ge_tooltip:0"魔方稳定产出§Y40§!铬资源"
- az_ziyuanzhuanhua_tan_tooltip:0"立刻获得§Y100§!地图外煤炭资源\n"
+ az_ziyuanzhuanhua_tan_tooltip:0"立刻获得§Y300§!地图外煤炭资源\n"
  azevent.22.t:0"一只普通喵"
  azevent.22.d:0"打开箱子后，里面是一只慵懒的肥猫，貌似没什么灵性，对我们应该没什么帮助，只能送给别人当做普通宠物了。"
  azevent.22.a:0"大懒猫"