diff --git a/src/common/ai_equipment/vnr_battleships.txt b/src/common/ai_equipment/vnr_battleships.txt
index ba1d3f8..5fb9f8b 100755
--- a/src/common/ai_equipment/vnr_battleships.txt
+++ b/src/common/ai_equipment/vnr_battleships.txt
@@ -111,7 +111,8 @@ naval_capital_battleship = {
 				fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
 				fixed_ship_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } }
 				front_1_custom_slot = ship_heavy_battery_triple
-				mid_1_custom_slot = ship_secondaries
+				front_2_custom_slot = ship_dp_secondaries_bb
+				mid_1_custom_slot = ship_anti_air
 				mid_2_custom_slot = ship_anti_air
 				mid_3_custom_slot = ship_dp_secondaries_bb
 				rear_1_custom_slot = ship_heavy_battery_triple
@@ -152,7 +153,8 @@ naval_capital_battleship = {
 				fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
 				fixed_ship_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } }
 				front_1_custom_slot = ship_heavy_battery_triple
-				mid_1_custom_slot = ship_dp_secondaries_bb
+				front_2_custom_slot = ship_dp_secondaries_bb
+				mid_1_custom_slot = ship_anti_air
 				mid_2_custom_slot = ship_anti_air
 				mid_3_custom_slot = ship_dp_secondaries_bb
 				rear_1_custom_slot = ship_heavy_battery_triple
@@ -182,7 +184,7 @@ naval_capital_battleship = {
 				fixed_ship_anti_air_slot = ship_missile_aa
 				fixed_ship_fire_control_system_slot = { module = ship_fire_control_system upgrade > current }
 				fixed_ship_radar_slot = { module = ship_radar upgrade > current }
-				fixed_ship_engine_slot = { any_of = { heavy_ship_engine_4_gas heavy_ship_engine_nuclear } }
+				fixed_ship_engine_slot = { upgrade = current any_of = { heavy_ship_engine_5 heavy_ship_engine_4 heavy_ship_engine_3 heavy_ship_engine_2 heavy_ship_engine_1 } }
 				fixed_ship_secondaries_slot = ship_dp_secondaries_bb
 				fixed_ship_armor_slot = { any_of = { ship_armor_bb_4 ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } }
 				fixed_ship_airplane_launcher_slot = ship_airplane_launcher
@@ -190,6 +192,7 @@ naval_capital_battleship = {
 				fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
 				fixed_ship_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } }
 				front_1_custom_slot = ship_heavy_battery_triple
+				front_2_custom_slot = ship_dp_secondaries_bb
 				mid_1_custom_slot = ship_dp_secondaries_bb
 				mid_2_custom_slot = { upgrade = current any_of = { ship_missile_2 ship_missile_1 } }
 				mid_3_custom_slot = ship_dp_secondaries_bb
@@ -229,9 +232,10 @@ naval_capital_battleship = {
 				fixed_ship_airplane_launcher_slot = ship_airplane_launcher
 				fixed_ship_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } }
 				front_1_custom_slot = ship_super_heavy_battery_triple
-				mid_1_custom_slot = ship_secondaries
+				front_2_custom_slot = ship_dp_secondaries_bb
+				mid_1_custom_slot = ship_anti_air
 				mid_2_custom_slot = ship_anti_air
-				mid_3_custom_slot = ship_secondaries
+				mid_3_custom_slot = ship_dp_secondaries_bb
 				rear_1_custom_slot = ship_super_heavy_battery_triple
 			}
 		}
@@ -270,6 +274,7 @@ naval_capital_battleship = {
 				fixed_ship_armor_scheme_slot = { upgrade = current any_of = { ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental_post_jutland ship_scheme_incremental } }
 				fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
 				front_1_custom_slot = ship_heavy_battery_triple
+				front_2_custom_slot = ship_dp_secondaries_bb
 				mid_1_custom_slot = ship_anti_air
 				mid_2_custom_slot = ship_anti_air
 				rear_1_custom_slot = ship_heavy_battery_triple
@@ -308,8 +313,10 @@ naval_capital_battleship = {
 				fixed_ship_armor_scheme_slot = { upgrade = current any_of = { ship_scheme_all_or_nothing_armor_box ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental } }
 				fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
 				front_1_custom_slot = ship_heavy_battery_triple
+				front_2_custom_slot = ship_dp_secondaries_bb
 				mid_1_custom_slot = ship_anti_air
 				mid_2_custom_slot = ship_anti_air
+				mid_3_custom_slot = ship_dp_secondaries_bb
 				rear_1_custom_slot = ship_heavy_battery_triple
 				rear_2_custom_slot = ship_heavy_battery_triple
 			}
@@ -318,6 +325,8 @@ naval_capital_battleship = {
 			ship_anti_air
 			ship_fire_control_system
 			ship_radar
+			ship_anti_air_circle
+			ship_super_heavy_weight_shell
 		}
 	}
 	capital_battleship_1944_expert = {
@@ -347,10 +356,11 @@ naval_capital_battleship = {
 				fixed_ship_armor_slot = { upgrade = current any_of = { ship_armor_bb_4 ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } }
 				fixed_ship_armor_scheme_slot = { upgrade = current any_of = { ship_scheme_all_or_nothing_armor_box ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental } }
 				fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
-				fixed_ship_extra_secondaries_slot = ship_super_heavy_weight_shell
 				front_1_custom_slot = ship_heavy_battery_triple
+				front_2_custom_slot = ship_dp_secondaries_bb
 				mid_1_custom_slot = ship_anti_air
 				mid_2_custom_slot = ship_anti_air
+				mid_3_custom_slot = ship_dp_secondaries_bb
 				rear_1_custom_slot = ship_heavy_battery_triple
 				rear_2_custom_slot = ship_heavy_battery_triple
 			}
@@ -359,6 +369,8 @@ naval_capital_battleship = {
 			ship_anti_air
 			ship_fire_control_system
 			ship_radar
+			ship_anti_air_circle
+			ship_super_heavy_weight_shell
 		}
 	}
 }
diff --git a/src/common/ai_strategy/naval_production.txt b/src/common/ai_strategy/naval_production.txt
index 8e0957e..dcefcf1 100755
--- a/src/common/ai_strategy/naval_production.txt
+++ b/src/common/ai_strategy/naval_production.txt
@@ -797,13 +797,13 @@ naval_unit_role_ratios_ENG_atwar = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_capital_bb
-		value = 80
+		value = 100
 	}
 
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_carrier
-		value = 100
+		value = 120
 	}
 
 	ai_strategy = {
@@ -844,13 +844,13 @@ naval_unit_role_ratios_ENG_late_peace = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_capital_bb
-		value = 5
+		value = 20
 	}
 
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_carrier
-		value = 10
+		value = 40
 	}
 
 	ai_strategy = {
@@ -1317,7 +1317,7 @@ naval_unit_role_ratios_JAP_prewar_enough_carrier = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_carrier
-		value = 60
+		value = 100
 	}
 	ai_strategy = {
 		type = dockyard_to_military_factory_ratio
@@ -1362,12 +1362,12 @@ naval_unit_role_ratios_JAP_atwar = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_capital_bb
-		value = 20
+		value = 40
 	}
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_carrier
-		value = 65
+		value = 100
 	}
 	ai_strategy = {
 		type = dockyard_to_military_factory_ratio
@@ -1470,16 +1470,10 @@ naval_unit_role_ratios_USA_great_depression = {
 		value = 200
 	}
 
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_screen_leader
-		value = 1
-	}
-
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_cruiser_light
-		value = 40
+		value = 150
 	}
 
 	ai_strategy = {
@@ -1514,7 +1508,7 @@ naval_unit_role_ratios_USA_go_to_war = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_cruiser_light
-		value = 120
+		value = 250
 	}
 
 	ai_strategy = {
@@ -1532,17 +1526,18 @@ naval_unit_role_ratios_USA_go_to_war = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_carrier
-		value = 120
+		value = 150
 	}
 	
 	ai_strategy = {
-		type = dockyard_to_military_factory_ratio
-		value = 200
+		type = building_target
+		id = dockyard
+		value = 50
 	}
 	ai_strategy = {
 		type = building_target
-		id = dockyard
-		value = 150
+		id = arms_factory
+		value = 80
 	}
 }
 
@@ -1569,7 +1564,7 @@ naval_unit_role_ratios_USA_atwar = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_cruiser_light
-		value = 150
+		value = 200
 	}
 	ai_strategy = {
 		type = role_ratio
@@ -1580,23 +1575,24 @@ naval_unit_role_ratios_USA_atwar = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_capital_bb
-		value = 60
+		value = 120
 	}
 
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_carrier
-		value = 120
+		value = 150
 	}
 	
 	ai_strategy = {
-		type = dockyard_to_military_factory_ratio
-		value = 250
+		type = building_target
+		id = dockyard
+		value = 100
 	}
 	ai_strategy = {
 		type = building_target
-		id = dockyard
-		value = 250
+		id = arms_factory
+		value = 300
 	}
 }
 
@@ -2446,7 +2442,7 @@ build_more_missile_cruisers = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_cruiser_medium
-		value = 20
+		value = 120
 	}
 
 	ai_strategy = {
diff --git a/src/common/decisions/MTG_naval_treaty.txt b/src/common/decisions/MTG_naval_treaty.txt
index 902efce..cd07133 100755
--- a/src/common/decisions/MTG_naval_treaty.txt
+++ b/src/common/decisions/MTG_naval_treaty.txt
@@ -85,6 +85,7 @@ MTG_naval_treaties = {
 							has_idea = MTG_naval_treaty_adherent
 							has_idea = MTG_naval_treaty_adherent_1936
 						}
+						NOT = { has_active_mission = MTG_escalator_clause_invocation_mission }
 					}
 					activate_mission = MTG_escalator_clause_invocation_mission
 					custom_effect_tooltip = MTG_escalator_clause_tt
@@ -195,6 +196,7 @@ MTG_naval_treaties = {
 							has_idea = MTG_naval_treaty_adherent
 							has_idea = MTG_naval_treaty_adherent_1936
 						}
+						NOT = { has_active_mission = MTG_escalator_clause_invocation_mission }
 					}
 					activate_mission = MTG_escalator_clause_invocation_mission
 					custom_effect_tooltip = MTG_escalator_clause_tt
@@ -800,7 +802,7 @@ MTG_naval_treaties = {
 				always = no
 			}
 		}
-		days_mission_timeout = 365
+		days_mission_timeout = 300
 	
 		visible = {
 			has_naval_treaty_trigger = yes
diff --git a/src/common/scripted_effects/_add_starting_tech.txt b/src/common/scripted_effects/_add_starting_tech.txt
index ce3d643..2bf337c 100755
--- a/src/common/scripted_effects/_add_starting_tech.txt
+++ b/src/common/scripted_effects/_add_starting_tech.txt
@@ -134,7 +134,6 @@ add_starting_techs = {
             landing_aid_system = 1
             arresting_gear = 1
             aviation_dawn = 1
-            night_air_strike = 1
             basic_periscope = 1
             improved_periscope = 1
             basic_ballast_tank = 1
diff --git a/src/common/scripted_triggers/_vnr_scripted_triggers.txt b/src/common/scripted_triggers/_vnr_scripted_triggers.txt
index fd14474..e1afdac 100755
--- a/src/common/scripted_triggers/_vnr_scripted_triggers.txt
+++ b/src/common/scripted_triggers/_vnr_scripted_triggers.txt
@@ -56,4 +56,23 @@ is_ai_naval_major = {
 		tag = BYG
 	}
 	is_ai = yes
+}
+
+allow_to_use_expert_navy = {
+	OR = {
+		AND = {
+			tag = HUJ
+			has_game_rule = { rule = eng_start_expert_navy option = FREE }
+		}
+		AND = {
+			tag = CHY
+			has_game_rule = { rule = jap_start_expert_navy option = FREE }
+		}
+		AND = {
+			tag = BYG
+			has_game_rule = { rule = usa_start_expert_navy option = FREE }
+		}
+	}
+	is_ai = yes
+	has_game_rule = { rule = ai_ship_design_style option = EXPERT }
 }
\ No newline at end of file
diff --git a/src/common/technologies/MTG_naval.txt b/src/common/technologies/MTG_naval.txt
index a54fad1..85d504f 100755
--- a/src/common/technologies/MTG_naval.txt
+++ b/src/common/technologies/MTG_naval.txt
@@ -1032,6 +1032,9 @@ technologies = {
 			max_strength = 0.25
 			naval_range = 0.2
 		}
+		enable_equipment_modules = {
+			light_ship_engine_4_gas
+		}
 
 		folder = {
 			name = mtgnavalfolder
@@ -1138,6 +1141,7 @@ technologies = {
 		}
 		path = {
 			leads_to_tech = treaty_cruiser_trend
+			##! leads_to_tech = large_cruiser_trend
 			research_cost_coeff = 1
 		}
 		path = {
@@ -1508,6 +1512,7 @@ technologies = {
 		}
 		enable_equipment_modules = {
 			structural_aluminum
+			cruiser_ship_engine_4_gas
 		}
 		heavy_cruiser = {
 			build_cost_ic = -0.1
@@ -2100,6 +2105,55 @@ technologies = {
 		}
 	}
 
+	##! large_cruiser_trend = {
+	##! 	xp_research_type = navy
+	##! 	xp_boost_cost = 20
+	##! 	xp_research_bonus = 1.50
+	##! 	start_year = 1925
+	##! 	research_cost = 0.5
+	##! 
+	##! 	enable_equipment_modules = {
+	##! 		ship_hull_cruiser_role_cb
+	##! 	}
+	##! 
+	##! 	heavy_cruiser = {
+	##! 		max_strength = 0.1
+	##! 		armor_value = 0.1
+	##! 	}
+	##! 	medium_cruiser = {
+	##! 		max_strength = 0.1
+	##! 		armor_value = 0.1
+	##! 	}
+	##! 	light_cruiser = {
+	##! 		max_strength = 0.1
+	##! 	}
+	##! 	path = {
+	##! 		leads_to_tech = basic_ship_hull_cruiser
+	##! 		research_cost_coeff = 1
+	##! 	}
+	##! 
+	##! 	folder = {
+	##! 		name = mtgnavalfolder
+	##! 		position = { x = -1 y = @1914_module_2 }
+	##! 	}
+	##! 
+	##! 	ai_will_do = {
+	##! 		factor = 1
+	##! 		modifier = {
+	##! 			num_of_naval_factories > 5
+	##! 			factor = 3
+	##! 		}
+	##! 	}
+	##! 
+	##! 	special_project_specialization = { specialization_naval }
+	##! 	categories = {
+	##! 		naval_equipment
+	##! 		cl_tech
+	##! 		ca_tech
+	##! 		mio_cat_tech_all_cruiser_and_modules
+	##! 	}
+	##! }
+
 	cruiser_gun_upgrade = {
 		on_research_complete = {
 			custom_effect_tooltip = ca_tech_4_tt
@@ -2635,6 +2689,11 @@ technologies = {
 	krupp_cemented_steel = {
 		on_research_complete = {
 			custom_effect_tooltip = bb_tech_10_tt
+			add_tech_bonus = {
+				bonus = 1
+				uses = 1
+				technology = improved_heavy_armor
+			}
 		}
 		xp_research_type = navy
 		xp_boost_cost = 20
@@ -2728,6 +2787,11 @@ technologies = {
 	homogeneous_krupp_steel = {
 		on_research_complete = {
 			custom_effect_tooltip = bb_tech_10_tt
+			add_tech_bonus = {
+				bonus = 1
+				uses = 1
+				technology = advanced_heavy_armor
+			}
 		}
 		xp_research_type = navy
 		xp_boost_cost = 20
@@ -3072,11 +3136,6 @@ technologies = {
 		}
 		research_cost = 1.5
 
-		path = {
-			leads_to_tech = gas_turbine
-			research_cost_coeff = 1
-		}
-
 		path = {
 			leads_to_tech = fuel_tank_upgrade
 			research_cost_coeff = 1
@@ -3685,7 +3744,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalfolder
-			position = { x = 3 y = @1944_module }
+			position = { x = 2 y = @1944_module }
 		}
 
 		ai_will_do = {
@@ -3712,7 +3771,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalfolder
-			position = { x = -3 y = @1944_module }
+			position = { x = -2 y = @1944_module }
 		}
 
 		ai_will_do = {
@@ -3730,34 +3789,6 @@ technologies = {
 		}
 	}
 
-	gas_turbine = {
-		research_cost = 1.5
-
-		enable_equipment_modules = {
-			heavy_ship_engine_4_gas
-		}
-
-		start_year = 1945
-
-		folder = {
-			name = mtgnavalfolder
-			position = { x = 1 y = @1944_module }
-		}
-
-		ai_will_do = {
-			factor = 0
-		}
-
-		special_project_specialization = { specialization_naval }
-		categories = {
-			naval_equipment
-			bb_tech
-			bc_tech
-			ship_modules_tech
-			mio_cat_tech_all_capital_ship_and_modules
-		}
-	}
-
 	combat_information_center = {
 		on_research_complete = {
 			custom_effect_tooltip = bb_tech_4_tt
@@ -3772,7 +3803,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalfolder
-			position = { x = -1 y = @1944_module }
+			position = { x = 0 y = @1944_module }
 		}
 		path = {
 			leads_to_tech = naval_tactical_data_system
@@ -3810,7 +3841,7 @@ technologies = {
 
 		folder = {
 			name = mtgnavalfolder
-			position = { x = -1 y = @1948 }
+			position = { x = 0 y = @1948 }
 		}
 		path = {
 			leads_to_tech = memory_expansion
@@ -4260,7 +4291,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 		path = {
-			leads_to_tech = night_air_strike
+			leads_to_tech = carrier_radio_range
 			research_cost_coeff = 1
 		}
 		path = {
@@ -4310,6 +4341,7 @@ technologies = {
 	improved_ship_hull_carrier = {
 		on_research_complete = {
 			custom_effect_tooltip = cv_tech_1_tt
+			set_technology = { escort_carriers_ship = 1 }
 		}
 
 		enable_equipments = {
@@ -4343,10 +4375,6 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
-		sub_technologies = {
-			escort_carriers_ship
-		}
-
 		research_cost = 1.75
 
 		start_year = 1940
@@ -4449,10 +4477,12 @@ technologies = {
 		on_research_complete = {
 			custom_effect_tooltip = cv_tech_2_tt
 		}
-		research_cost = 0.75
+		research_cost = 0.35
 		start_year = 1925
 
-		sortie_efficiency = 0.1
+		sortie_efficiency = 0.05
+		carrier_capacity_penalty_reduction = -0.05
+		air_accidents_factor = -0.05
 
 		folder = {
 			name = mtgnavalfolder
@@ -4513,22 +4543,26 @@ technologies = {
 		}
 	}
 
-	night_air_strike = {
-		research_cost = 0.75
+	carrier_radio_range = {
+		research_cost = 0.5
 		start_year = 1934
 
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.25
 
-		air_carrier_night_penalty_reduction_factor = 0.05
-		carrier_night_traffic = 0.05
+		air_accidents_factor = -0.1
+		fighter_sortie_efficiency = 0.1
 
 		folder = {
 			name = mtgnavalfolder
 			position = { x = 1 y = @1932_module }
 		}
 
+		dependencies = {
+			radio = 1
+		}
+
 		ai_will_do = {
 			factor = 1
 		}
@@ -4564,12 +4598,10 @@ technologies = {
 				type = capital_ship
 				archetype = ship_hull_heavy
 			}
+			NOT = { has_tech = aviation_dawn }
 		}
 		on_research_complete = {
-			if = {
-				limit = { NOT = { has_tech = aviation_dawn } }
-				add_political_power = -20
-			}
+			add_political_power = -20
 		}
 
 		folder = {
@@ -4604,7 +4636,7 @@ technologies = {
 			custom_effect_tooltip = cv_tech_1_tt
 		}
 		research_cost = 1.25
-		start_year = 1938
+		start_year = 1939
 
 		xp_research_type = navy
 		xp_boost_cost = 10
@@ -4633,6 +4665,10 @@ technologies = {
 			}
 		}
 
+		dependencies = {
+			armor_piercing_bombs = 1
+		}
+
 		special_project_specialization = { specialization_naval specialization_air }
 		categories = {
 			naval_equipment
@@ -4645,7 +4681,7 @@ technologies = {
 		on_research_complete = {
 			custom_effect_tooltip = cv_tech_5_tt
 		}
-		research_cost = 1.25
+		research_cost = 1
 		start_year = 1941
 
 		xp_research_type = navy
@@ -4657,7 +4693,7 @@ technologies = {
 		}
 
 		carrier = {
-			max_organisation = 10
+			max_organisation = 5
 			max_strength = 0.1
 			reliability = 0.05
 		}
@@ -5027,7 +5063,7 @@ technologies = {
 		research_cost = 1
 		start_year = 1951
 
-		air_accidents_factor = -0.1
+		air_carrier_night_penalty_reduction_factor = -0.1
 		carrier_night_traffic = 0.1
 
 		folder = {
@@ -5391,6 +5427,12 @@ technologies = {
 	}
 
 	basic_submarine_snorkel = {
+		is_special_project_tech = yes
+		allow = {
+			ROOT = {
+				is_special_project_completed = sp:sp_submarine_snorkel
+			}
+		}
 
 		enable_equipment_modules = {
 			ship_sub_snorkel_1
@@ -5425,6 +5467,12 @@ technologies = {
 	}
 
 	improved_submarine_snorkel = {
+		is_special_project_tech = yes
+		allow = {
+			ROOT = {
+				is_special_project_completed = sp:sp_submarine_snorkel
+			}
+		}
 
 		enable_equipment_modules = {
 			ship_sub_snorkel_2
@@ -6095,6 +6143,9 @@ technologies = {
 		enable_equipments = {
 			vnr_ship_hull_merchant_carrier
 		}
+		enable_equipment_modules = {
+			carrier_civilian_material
+		}
 
 		research_cost = 1
 		start_year = 1940
@@ -6152,7 +6203,7 @@ technologies = {
 		enable_equipment_modules = {
 			crewed_torpedo
 		}
-		research_cost = 0.6
+		research_cost = 0.1
 		start_year = 1930
 
 		ai_will_do = {
@@ -6166,8 +6217,8 @@ technologies = {
 		}
 	}
 	escort_carriers_ship = {
-		on_research_complete = {
-			custom_effect_tooltip = cv_tech_6_tt
+		allow = {
+			always = no
 		}
 		enable_equipments = {
 			vnr_ship_hull_escort_carrier
@@ -6179,13 +6230,7 @@ technologies = {
 		start_year = 1940
 
 		ai_will_do = {
-			factor = 0
-		}
-		special_project_specialization = { specialization_naval }
-		categories = {
-			cv_tech
-			naval_equipment
-			mio_cat_tech_all_carrier_and_modules
+			factor = 1
 		}
 	}
 	super_carriers = {
diff --git a/src/common/technologies/MTG_naval_Support.txt b/src/common/technologies/MTG_naval_Support.txt
index afac8f7..6a0080a 100755
--- a/src/common/technologies/MTG_naval_Support.txt
+++ b/src/common/technologies/MTG_naval_Support.txt
@@ -153,7 +153,7 @@ technologies = {
 
 	basic_light_battery = {
 
-		research_cost = 0.5
+		research_cost = 0.25
 
 		start_year = 1924
 
@@ -225,15 +225,12 @@ technologies = {
 		}
 		light_cruiser = {
 			lg_attack = 0.05
-			lg_armor_piercing = 0.05
 		}
 		heavy_cruiser = {
 			lg_attack = 0.05
-			lg_armor_piercing = 0.05
 		}
 		medium_cruiser = {
 			lg_attack = 0.05
-			lg_armor_piercing = 0.05
 		}
 		##! armored_cruiser = {
 		##! 	lg_attack = 0.05
@@ -284,7 +281,7 @@ technologies = {
 
 	improved_light_battery = {
 
-		research_cost = 0.5
+		research_cost = 0.25
 
 		start_year = 1939
 
@@ -343,15 +340,12 @@ technologies = {
 		}
 		light_cruiser = {
 			lg_attack = 0.05
-			lg_armor_piercing = 0.05
 		}
 		heavy_cruiser = {
 			lg_attack = 0.05
-			lg_armor_piercing = 0.05
 		}
 		medium_cruiser = {
 			lg_attack = 0.05
-			lg_armor_piercing = 0.05
 		}
 		##! armored_cruiser = {
 		##! 	lg_attack = 0.05
@@ -406,7 +400,7 @@ technologies = {
 
 	advanced_light_battery = {
 
-		research_cost = 0.5
+		research_cost = 0.25
 
 		start_year = 1944
 
@@ -450,7 +444,7 @@ technologies = {
 
 	basic_medium_battery = {
 
-		research_cost = 0.75
+		research_cost = 0.5
 
 		start_year = 1936
 
@@ -516,16 +510,13 @@ technologies = {
 
 
 		light_cruiser = {
-			lg_attack = 0.05
 			lg_armor_piercing = 0.05
 		}
 		heavy_cruiser = {
-			hg_attack = 0.05
-			hg_armor_piercing = 0.05
+			lg_armor_piercing = 0.05
 		}
 		medium_cruiser = {
-			hg_attack = 0.05
-			hg_armor_piercing = 0.05
+			lg_armor_piercing = 0.05
 		}
 
 		folder = {
@@ -554,7 +545,7 @@ technologies = {
 
 	improved_medium_battery = {
 
-		research_cost = 0.75
+		research_cost = 0.5
 
 		start_year = 1939
 
@@ -620,16 +611,13 @@ technologies = {
 		}
 
 		light_cruiser = {
-			lg_attack = 0.05
 			lg_armor_piercing = 0.05
 		}
 		heavy_cruiser = {
-			hg_attack = 0.05
-			hg_armor_piercing = 0.05
+			lg_armor_piercing = 0.05
 		}
 		medium_cruiser = {
-			hg_attack = 0.05
-			hg_armor_piercing = 0.05
+			lg_armor_piercing = 0.05
 		}
 
 
@@ -659,7 +647,7 @@ technologies = {
 
 	advanced_medium_battery = {
 
-		research_cost = 0.75
+		research_cost = 0.5
 
 		start_year = 1944
 
@@ -707,7 +695,7 @@ technologies = {
 
 	basic_heavy_battery = {
 
-		research_cost = 1
+		research_cost = 0.75
 
 		start_year = 1924
 
@@ -760,7 +748,7 @@ technologies = {
 	}
 	improved_heavy_battery = {
 
-		research_cost = 1
+		research_cost = 0.75
 
 		start_year = 1939
 
@@ -809,7 +797,7 @@ technologies = {
 	}
 	advanced_heavy_battery = {
 
-		research_cost = 1
+		research_cost = 0.75
 
 		start_year = 1944
 
@@ -970,7 +958,7 @@ technologies = {
 
 	basic_dp_light_battery = {
 
-		research_cost = 0.5
+		research_cost = 0.3
 
 		start_year = 1939
 
@@ -1018,7 +1006,7 @@ technologies = {
 
 	improved_dp_light_battery = {
 
-		research_cost = 0.5
+		research_cost = 0.3
 
 		start_year = 1941
 
@@ -1066,7 +1054,7 @@ technologies = {
 
 	advanced_dp_light_battery = {
 
-		research_cost = 0.5
+		research_cost = 0.3
 
 		start_year = 1944
 
@@ -1114,7 +1102,7 @@ technologies = {
 
 	basic_dp_medium_battery = {
 
-		research_cost = 0.75
+		research_cost = 0.5
 
 		start_year = 1944
 
@@ -1291,7 +1279,7 @@ technologies = {
 
 
 	ship_rocket_artillery = {
-		research_cost = 0.75
+		research_cost = 0.1
 		start_year = 1943
 
 		dependencies = {
@@ -1327,7 +1315,7 @@ technologies = {
 	}
 
 	unmanned_gun_turret = {
-		research_cost = 1
+		research_cost = 0.75
 		start_year = 1947
 
 		heavy_cruiser = {
@@ -1379,7 +1367,7 @@ technologies = {
 	}
 
 	modern_generic_battery = {
-		research_cost = 1
+		research_cost = 0.75
 		start_year = 1949
 
 		on_research_complete = {
@@ -1563,7 +1551,7 @@ technologies = {
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.50
-		research_cost = 0.75
+		research_cost = 0.5
 
 		start_year = 1942
 		destroyer = {
@@ -1627,7 +1615,7 @@ technologies = {
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.50
-		research_cost = 1
+		research_cost = 0.75
 		enable_equipment_modules = {
 			sub_wire_guided_torpedo
 		}
@@ -1674,7 +1662,7 @@ technologies = {
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.50
-		research_cost = 1.25
+		research_cost = 1
 
 		start_year = 1951
 		destroyer = {
@@ -1731,7 +1719,7 @@ technologies = {
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.50
-		research_cost = 0.75
+		research_cost = 0.5
 
 		start_year = 1936
 
@@ -1776,7 +1764,7 @@ technologies = {
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.50
-		research_cost = 0.75
+		research_cost = 0.5
 
 		start_year = 1936
 
@@ -1820,7 +1808,7 @@ technologies = {
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.50
-		research_cost = 0.75
+		research_cost = 0.5
 
 		start_year = 1943
 		dependencies = {
@@ -1928,7 +1916,7 @@ technologies = {
 	}
 	advanced_ship_torpedo_launcher = {
 
-		research_cost = 0.75
+		research_cost = 0.5
 
 		start_year = 1940
 
@@ -1973,7 +1961,7 @@ technologies = {
 	}
 	modern_ship_torpedo_launcher = {
 
-		research_cost = 1
+		research_cost = 0.75
 
 		start_year = 1944
 
@@ -2015,7 +2003,7 @@ technologies = {
 		}
 	}
 	coldwar_ship_torpedo_launcher = {
-		research_cost = 1.25
+		research_cost = 1
 		start_year = 1949
 
 		enable_equipment_modules = {
@@ -2408,7 +2396,7 @@ technologies = {
 
 	submarine_mine_laying = {
 
-		research_cost = 0.75
+		research_cost = 0.5
 
 		start_year = 1922
 
@@ -2441,7 +2429,7 @@ technologies = {
 
 	improved_submarine_mine_laying = {
 
-		research_cost = 0.75
+		research_cost = 0.5
 
 		start_year = 1940
 
@@ -2470,7 +2458,7 @@ technologies = {
 
 	improved_naval_mines = {
 
-		research_cost = 1
+		research_cost = 0.5
 
 		start_year = 1936
 
@@ -2545,7 +2533,7 @@ technologies = {
 
 	advanced_naval_mines = {
 
-		research_cost = 1.25
+		research_cost = 0.5
 
 		start_year = 1942
 
@@ -2650,7 +2638,7 @@ technologies = {
 
 	modern_naval_mines = {
 
-		research_cost = 1.5
+		research_cost = 0.75
 
 		start_year = 1945
 
diff --git a/src/events/00_navy_rework.txt b/src/events/00_navy_rework.txt
index fe2ab1c..2be9907 100755
--- a/src/events/00_navy_rework.txt
+++ b/src/events/00_navy_rework.txt
@@ -46,8 +46,17 @@ country_event = {
         	load_oob = 00_DEN_vnr_naval
         }
         HUJ = {
-        	ENG_start_naval_variants = yes
-        	load_oob = 00_ENG_vnr_naval
+			if = {
+				limit = {
+					allow_to_use_expert_navy = yes
+				}
+				ENG_expert_AI_variants = yes
+				load_oob = 03_ENG_vnr_expert
+			}
+			else = {
+				ENG_start_naval_variants = yes
+        		load_oob = 00_ENG_vnr_naval
+			}
 			if = {
 				limit = { has_dlc = "By Blood Alone" }
 				load_oob = 01_ENG_vnr_air_bba
@@ -88,8 +97,17 @@ country_event = {
         	load_oob = 00_ITA_vnr_naval
         }
         CHY = {
-        	JAP_start_naval_variants = yes
-        	load_oob = 00_JAP_vnr_naval
+        	if = {
+				limit = {
+					allow_to_use_expert_navy = yes
+				}
+				JAP_expert_AI_variants = yes
+				load_oob = 03_JAP_vnr_expert
+			}
+			else = {
+				JAP_start_naval_variants = yes
+        		load_oob = 00_JAP_vnr_naval
+			}
 			if = {
 				limit = { has_dlc = "By Blood Alone" }
 				load_oob = 01_JAP_vnr_air_bba
@@ -127,8 +145,17 @@ country_event = {
         	load_oob = 00_TUR_vnr_naval
         }
         BYG = {
-        	USA_start_naval_variants = yes
-        	load_oob = 00_USA_vnr_naval
+        	if = {
+				limit = {
+					allow_to_use_expert_navy = yes
+				}
+				USA_expert_AI_variants = yes
+				load_oob = 03_USA_vnr_expert
+			}
+			else = {
+				USA_start_naval_variants = yes
+        		load_oob = 00_USA_vnr_naval
+			}
 			if = {
 				limit = { has_dlc = "By Blood Alone" }
 				load_oob = 01_USA_vnr_air_bba
diff --git a/src/events/ai_ships.txt b/src/events/ai_ships.txt
index 976780f..2d819d8 100755
--- a/src/events/ai_ships.txt
+++ b/src/events/ai_ships.txt
@@ -327,6 +327,7 @@ country_event = {
 				limit = {
 					is_ai = yes
 				}
+				complete_special_project = sp:sp_air_radar
 				set_technology = {
 					improved_ship_hull_heavy = 1 
 					improved_ship_hull_light = 1 
@@ -335,8 +336,7 @@ country_event = {
 					antiair2 = 1 
 					antiair3 = 1 
 					improved_fire_control_system = 1 
-					decimetric_radar = 1 
-					improved_decimetric_radar = 1 
+					cavity_magnatron = 1 
 					basic_dp_light_battery = 1 
 					improved_heavy_battery = 1
 					improved_super_heavy_battery = 1
@@ -364,11 +364,15 @@ country_event = {
 					basic_light_shell = 1
 					basic_medium_shell = 1
 					basic_heavy_shell = 1
+					magnetic_detonator = 1
+					oxygen_torpedo = 1
 
 					damage_control_1 = 1
 					fire_control_methods_1 = 1
 					basic_ballast_tank = 1
 					improved_ballast_tank = 1
+					dive_bomber_study = 1
+					carrier_radio_range = 1
 				}
 				ai_get_navy_experience = yes
 				ai_get_mio_upgrade = yes
@@ -437,7 +441,7 @@ country_event = {
 					antiair4 = 1 
 					antiair5 = 1 
 					advanced_fire_control_system = 1 
-					centimetric_radar = 1 
+					monopulse_radar = 1 
 					advanced_dp_light_battery = 1 
 					advanced_heavy_battery = 1 
 					advanced_medium_battery = 1 
@@ -456,6 +460,7 @@ country_event = {
 					homogeneous_krupp_steel = 1
 
 					modern_ship_torpedo_launcher = 1
+					proximity_detonator = 1
 					
 					fire_control_methods_3 = 1
 				}
@@ -607,6 +612,7 @@ country_event = {
 					iff_device = 1
 					wire_guided_torpedo = 1
 					super_carriers = 1
+					coldwar_ship_torpedo_launcher = 1
 				}
 				ai_get_navy_experience = yes
 				ai_get_mio_upgrade = yes
@@ -760,7 +766,7 @@ country_event = {
 			has_global_flag = {
 				flag = naval_tech_1940
 				value > 0
-				days > 545
+				days > 900
 			}
 			has_global_flag = naval_tech_1943
 		}
@@ -776,6 +782,8 @@ country_event = {
 					is_ai = yes
 				}
 				set_technology = {
+					centimetric_radar = 1
+					phased_array = 1
 					folding_wing = 1
 					carrier_mass_production = 1
 					carrier_damage_control = 1
@@ -785,6 +793,12 @@ country_event = {
 					fire_control_methods_2 = 1
 					battleship_aa_upgrade = 1
 					escort_carriers_ship = 1
+
+					improved_light_shell = 1
+					improved_medium_shell = 1
+					improved_heavy_shell = 1
+					improved_dp_light_battery = 1
+					homing_torpedo = 1
 				}
 				ai_get_navy_experience = yes
 				ai_get_mio_upgrade = yes