diff --git a/src/common/ai_equipment/vnr_battleships.txt b/src/common/ai_equipment/vnr_battleships.txt
index 35a50b6..5b42ab9 100755
--- a/src/common/ai_equipment/vnr_battleships.txt
+++ b/src/common/ai_equipment/vnr_battleships.txt
@@ -175,7 +175,7 @@ naval_capital_battleship = {
 				fixed_ship_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } }
 				front_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
 				mid_1_custom_slot = ship_dp_secondaries_bb
-				mid_2_custom_slot = ship_missile_1
+				mid_2_custom_slot = { upgrade = current any_of = { ship_missile_2 ship_missile_1 } }
 				mid_3_custom_slot = ship_dp_secondaries_bb
 				rear_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
 				rear_2_custom_slot = ship_missile_aa
diff --git a/src/common/ai_strategy/naval_production.txt b/src/common/ai_strategy/naval_production.txt
index 13cefb6..8772072 100755
--- a/src/common/ai_strategy/naval_production.txt
+++ b/src/common/ai_strategy/naval_production.txt
@@ -2339,19 +2339,19 @@ we_need_cv_planes_2 = {
 	ai_strategy = {
 		type = equipment_production_min_factories
 		id = cv_fighter
-		value = 2
+		value = 3
 	}
 
 	ai_strategy = {
 		type = equipment_production_min_factories
 		id = cv_naval_bomber
-		value = 2
+		value = 5
 	}
 	
 	ai_strategy = {
 		type = equipment_production_min_factories
 		id = cv_cas
-		value = 2
+		value = 5
 	}
 
 	ai_strategy = {
@@ -2409,19 +2409,19 @@ we_need_cv_planes_3 = {
 	ai_strategy = {
 		type = equipment_production_min_factories
 		id = cv_fighter
-		value = 3
+		value = 5
 	}
 
 	ai_strategy = {
 		type = equipment_production_min_factories
 		id = cv_naval_bomber
-		value = 3
+		value = 8
 	}
 	
 	ai_strategy = {
 		type = equipment_production_min_factories
 		id = cv_cas
-		value = 3
+		value = 8
 	}
 
 	ai_strategy = {
diff --git a/src/common/ideas/vnr_navy_spirits.txt b/src/common/ideas/vnr_navy_spirits.txt
index 1647bf2..9518683 100755
--- a/src/common/ideas/vnr_navy_spirits.txt
+++ b/src/common/ideas/vnr_navy_spirits.txt
@@ -50,6 +50,22 @@ ideas = {
 				}
             }
         }
+        murwik_naval_academy = {
+            ledger = navy
+            visible = { original_tag = TIX }
+            modifier = {
+                navy_leader_start_level = 1
+                trait_ironside_xp_gain_factor = 0.15
+                trait_seawolf_xp_gain_factor = 0.15
+            }
+            ai_will_do = {
+                factor = 1.5
+				modifier = {
+					factor = 0
+					NOT = { has_dlc = "No Step Back" }
+				}
+            }
+        }
     }
 
     navy_spirit = {
@@ -148,6 +164,22 @@ ideas = {
 				}
             }
         }
+        lack_maintainence_facilities = {
+            ledger = navy
+            available = {
+				custom_trigger_tooltip = {
+					tooltip = recovering_from_naval_race_tt
+					NOT = { has_global_flag = vnr_enabled }
+				}
+            }
+            modifier = {
+                repair_speed_factor = -0.25
+                naval_morale_factor = -0.25
+            }
+            ai_will_do = {
+                factor = 0
+            }
+        }
     }
 
     naval_command_spirit = {
diff --git a/src/common/scripted_effects/_add_starting_tech.txt b/src/common/scripted_effects/_add_starting_tech.txt
index e42fc5e..fbd7ce2 100755
--- a/src/common/scripted_effects/_add_starting_tech.txt
+++ b/src/common/scripted_effects/_add_starting_tech.txt
@@ -43,6 +43,7 @@ add_starting_techs = {
             basic_cruiser_armor = 1
             incremental_armor_scheme = 1
             mixed_armor_scheme = 1
+            all_or_nothing_armor_scheme = 1
             basic_torpedo_defense = 1
             improved_torpedo_defense = 1
             enhanced_horizontal_defense = 1
diff --git a/src/common/technologies/MTG_naval.txt b/src/common/technologies/MTG_naval.txt
index 2d1e0c9..fa9f46f 100755
--- a/src/common/technologies/MTG_naval.txt
+++ b/src/common/technologies/MTG_naval.txt
@@ -875,17 +875,10 @@ technologies = {
 	}
 
 	destroyer_missile_upgrade = {
-		research_cost = 1.25
+		research_cost = 1
 		start_year = 1946
-		is_special_project_tech = yes
-		allow = {
-			ROOT = {
-				is_special_project_completed = sp:sp_rockets_ballistic_missile
-			}
-		}
 
 		enable_equipment_modules = {
-			ship_missile_aa_1
 			ship_hull_light_role_dda
 		}
 
@@ -893,6 +886,9 @@ technologies = {
 			name = mtgnavalfolder
 			position = { x = 3 y = 22 }
 		}
+		dependencies = {
+			ship_to_ship_missile = 1
+		}
 
 		ai_will_do = {
 			factor = 1
@@ -3881,6 +3877,7 @@ technologies = {
 			carrier_wooden_deck
 			carrier_bb_conversion
 			carrier_bc_conversion
+			ship_hull_civilian_role_av
 		}
 		ship_hull_carrier_design_cost_factor = -0.1
 		path = {
@@ -3925,6 +3922,8 @@ technologies = {
 			ship_deck_space_armored
 			carrier_scouting_unit
 			carrier_no_island
+			ship_armor_carrier_1
+			ship_armor_carrier_heavy_1
 		}
 
 		path = {
@@ -3984,6 +3983,8 @@ technologies = {
 			carrier_ship_engine_2
 			carrier_ship_engine_2_diesel
 			carrier_secondary_island
+			ship_armor_carrier_2
+			ship_armor_carrier_heavy_2
 		}
 		path = {
 			leads_to_tech = dive_bomber_study
@@ -4042,6 +4043,8 @@ technologies = {
 			carrier_ship_engine_3
 			carrier_ship_engine_3_diesel
 			side_lift
+			ship_armor_carrier_3
+			ship_armor_carrier_heavy_3
 		}
 		path = {
 			leads_to_tech = advanced_ship_hull_carrier
@@ -4112,6 +4115,8 @@ technologies = {
 		enable_equipment_modules = {
 			carrier_ship_engine_4
 			carrier_ship_engine_4_diesel
+			ship_armor_carrier_4
+			ship_armor_carrier_heavy_4
 		}
 		research_cost = 1.75
 		path = {
@@ -4765,6 +4770,7 @@ technologies = {
 			sub_ship_engine_1
 			pressure_hull_1
 			sub_ship_periscope_0
+			sub_conning_tower_0
 		}
 
 		sub_technologies = {
@@ -4944,6 +4950,7 @@ technologies = {
 			sub_ship_engine_4
 			pressure_hull_4
 			ship_sub_torpedo_computer_2
+			sub_conning_tower_1
 		}
 		path = {
 			leads_to_tech = improved_submarine_snorkel
@@ -4997,6 +5004,7 @@ technologies = {
 			vnr_ship_hull_submarine_5
 		}
 		enable_equipment_modules = {
+			pressure_hull_5
 			ship_sub_torpedo_computer_3
 		}
 
@@ -5009,7 +5017,7 @@ technologies = {
 			position = { x = -1 y = 25 }
 		}
 		path = {
-			leads_to_tech = missile_submarine
+			leads_to_tech = modern_periscope
 			research_cost_coeff = 1
 		}
 		path = {
@@ -5249,11 +5257,11 @@ technologies = {
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.50
-		research_cost = 1.25
+		research_cost = 0.7
 
 		start_year = 1939
 
-		naval_torpedo_cooldown_factor = -0.2
+		naval_torpedo_cooldown_factor = -0.125
 
 		folder = {
 			name = mtgnavalfolder
@@ -5548,17 +5556,12 @@ technologies = {
 		}
 	}
 
-	missile_submarine = {
-		research_cost = 1
+	modern_periscope = {
+		research_cost = 0.75
 		enable_equipment_modules = {
-			ship_cruise_missile_sub_1
+			sub_ship_periscope_4
+			sub_conning_tower_2
 		}
-		allow = {
-			ROOT = {
-				is_special_project_completed = sp:sp_naval_rocket_launching_submarine
-			}
-		}
-		is_special_project_tech = yes
 
 		start_year = 1951
 
@@ -5575,8 +5578,8 @@ technologies = {
 		categories = {
 			naval_equipment
 			ss_tech
+			ship_modules_tech
 			mio_cat_tech_all_submarine_and_modules
-			rocketry
 		}
 	}
 	rescue_submarine = {
@@ -5634,6 +5637,9 @@ technologies = {
 		submarine = {
 			convoy_raiding_coordination = 0.1
 		}
+		enable_equipment_modules = {
+			sub_bow_sonar
+		}
 
 		start_year = 1953
 
@@ -5743,6 +5749,7 @@ technologies = {
 		enable_equipment_modules = {
 			carrier_shbb_conversion
 			ship_deck_space_converted
+			ship_armor_carrier_shbb
 		}
 
 		research_cost = 1
@@ -5819,7 +5826,7 @@ technologies = {
 			vnr_ship_hull_super_carrier
 		}
 		enable_equipment_modules = {
-			ship_carrier_armor_heavy
+			ship_armor_carrier_heavy_5
 			ship_deck_space_big
 			ship_ski_jump_ramp
 		}
@@ -5917,7 +5924,11 @@ technologies = {
 
 		folder = {
 			name = mtgnavalfolder
-			position = { x = 0 y = 6 }
+			position = { x = 0 y = 4 }
+		}
+		path = {
+			leads_to_tech = advanced_missile_system
+			research_cost_coeff = 1
 		}
 
 		ai_will_do = {
@@ -5927,6 +5938,33 @@ technologies = {
 		enable_equipment_modules = {
 			ship_missile_1
 			ship_cruise_missile_1
+			ship_missile_aa_1
+		}
+
+		special_project_specialization = { specialization_naval }
+		categories = {
+			rocketry
+			naval_equipment
+			ship_modules_tech
+		}
+	}
+
+	advanced_missile_system = {
+		research_cost = 2
+		start_year = 1949
+
+		folder = {
+			name = mtgnavalfolder
+			position = { x = 0 y = 6 }
+		}
+
+		ai_will_do = {
+			factor = 2
+		}
+
+		enable_equipment_modules = {
+			ship_missile_2
+			ship_missile_aa_2
 		}
 
 		special_project_specialization = { specialization_naval }
diff --git a/src/common/technologies/MTG_naval_Support.txt b/src/common/technologies/MTG_naval_Support.txt
index 6d1d01e..7213638 100755
--- a/src/common/technologies/MTG_naval_Support.txt
+++ b/src/common/technologies/MTG_naval_Support.txt
@@ -2983,6 +2983,7 @@ technologies = {
 			fuel_tanker_silo
 			dry_cargo_storage
 			civilian_ship_engine_1
+			ship_hull_civilian_role_ap
 		}
 		special_project_specialization = { specialization_naval }
 		categories = {
@@ -3224,6 +3225,7 @@ technologies = {
 		}
 		enable_equipment_modules = {
 			supply_hub
+			ship_hull_civilian_role_ao
 		}
 		folder = {
 			name = mtgnavalsupportfolder
@@ -3285,6 +3287,7 @@ technologies = {
 		enable_equipment_modules = {
 			civilian_ship_engine_2
 			supply_hub
+			ship_hull_civilian_role_ao
 		}
 
 		special_project_specialization = { specialization_naval }
diff --git a/src/events/ai_ships.txt b/src/events/ai_ships.txt
index 4331259..e29c0ed 100755
--- a/src/events/ai_ships.txt
+++ b/src/events/ai_ships.txt
@@ -548,7 +548,8 @@ country_event = {
 					wake_homing_torpedo = 1
 					unmanned_gun_turret = 1
 					modern_generic_battery = 1
-					missile_submarine = 1
+					modern_periscope = 1
+					advanced_missile_system = 1
 				}
 				ai_get_navy_experience = yes
 			}