diff --git a/common/ship_sizes/RG_ship_sizes.txt b/common/ship_sizes/RG_ship_sizes.txt
index 077fa35..6392371 100644
--- a/common/ship_sizes/RG_ship_sizes.txt
+++ b/common/ship_sizes/RG_ship_sizes.txt
@@ -125,7 +125,7 @@ RG_graygoo_capitalship = {
 	construction_type = starbase_shipyard
 	combat_size_multiplier = 4
 	prerequisites = {
-		"tech_object_gray_6"
+		"tech_gray_juggernaut_8"
 	}
 	required_component_set = "power_core"
 	required_component_set = "ftl_components"
@@ -500,7 +500,7 @@ RG_gray_juggernaut = {
 	default_behavior = colossus
 	is_designable = yes
 	prerequisites = {
-		"tech_object_gray_6"
+		"tech_gray_juggernaut_8"
 	}
 	class = shipclass_starbase
 	construction_type = starbase_shipyard
diff --git a/common/special_projects/!_RG_projects_distant_stars.txt b/common/special_projects/!_RG_projects_distant_stars.txt
index 3325470..5c72361 100644
--- a/common/special_projects/!_RG_projects_distant_stars.txt
+++ b/common/special_projects/!_RG_projects_distant_stars.txt
@@ -117,7 +117,7 @@ special_project = {
 		}
 	}
 	on_success = {
-		fleet = {
+		event_target:gray_warship = {
 			set_event_locked = no
 		}
 		owner = {
diff --git a/common/technology/rg_tech.txt b/common/technology/rg_tech.txt
index 95961f6..0e6d5af 100644
--- a/common/technology/rg_tech.txt
+++ b/common/technology/rg_tech.txt
@@ -188,6 +188,34 @@ tech_gray_army_7 = {
 	}
 }
 
+tech_gray_juggernaut_8 = {
+	area = engineering
+	cost = 5000
+	tier = 5
+	is_rare = yes
+	category = {
+		voidcraft
+	}
+	ai_update_type = military
+	weight = @tier2weight3
+	prerequisites = {
+		"tech_gray_matter_remix_2"
+		"tech_juggernaut"
+		"tech_mega_engineering"
+	}
+	ai_weight = {
+		factor = 0		#weapons are good
+		modifier = {
+			factor = 1.25
+			has_ethic = ethic_militarist
+		}
+		modifier = {
+			factor = 1.5
+			has_ethic = ethic_fanatic_militarist
+		}
+	}
+}
+
 tech_gray_repair_system_1 = {
 	area = engineering
 	cost = 5000
diff --git a/events/RG_events.txt b/events/RG_events.txt
index 9080a33..83ef022 100644
--- a/events/RG_events.txt
+++ b/events/RG_events.txt
@@ -596,35 +596,7 @@ country_event = {
 				destroy_template = yes
 			}
 		}
-		create_fleet = {
-			name = "NAME_Gray"
-			settings = {
-				can_upgrade = no
-				can_disband = no
-				can_change_composition = no
-				can_change_leader = yes
-				uses_naval_capacity = no
-				spawn_debris = no
-			}
-			effect = {
-				set_owner = prev
-				create_ship = {
-					name = "NAME_Gray"
-					design = "NAME_Gray_Warship"
-					prefix = no
-					upgradable = yes
-				}
-				set_fleet_stance = aggressive
-				set_location = {
-					target = event_target:gray_owner_capital_starbase
-					distance = 0
-					angle = random
-				}
-				set_fleet_flag = gray_fleet
-				save_global_event_target_as = gray_warship
-				assign_leader = event_target:gray_leader_admiral
-			}
-		}
+		rg_warship_init_mod1 = yes
 		random_situation = {
 			limit = {
 				is_situation_type = situation_rg_gray_mod1
@@ -661,35 +633,11 @@ country_event = {
 				destroy_template = yes
 			}
 		}
-		create_fleet = {
-			name = "NAME_Gray"
-			settings = {
-				can_upgrade = no
-				can_disband = no
-				can_change_composition = no
-				can_change_leader = yes
-				uses_naval_capacity = no
-				spawn_debris = no
-			}
-			effect = {
-				set_owner = prev
-				create_ship = {
-					name = "NAME_Gray"
-					design = "NAME_gray_capitalship"
-					prefix = no
-					upgradable = yes
-				}
-				set_fleet_stance = aggressive
-				set_location = {
-					target = event_target:gray_owner_capital_starbase
-					distance = 0
-					angle = random
-				}
-				set_fleet_flag = gray_fleet
-				save_global_event_target_as = gray_warship
-				assign_leader = event_target:gray_leader_admiral
-			}
+		create_ship_design = {
+			design = "NAME_gray_capitalship"
 		}
+		add_ship_design = last_created_design
+		rg_warship_init_mod2 = yes
 	}
 	option = {
 		name = OK
diff --git a/localisation/simp_chinese/RG_l_simp_chinese.yml b/localisation/simp_chinese/RG_l_simp_chinese.yml
index de5c71f..02fcd9d 100644
--- a/localisation/simp_chinese/RG_l_simp_chinese.yml
+++ b/localisation/simp_chinese/RG_l_simp_chinese.yml
@@ -238,6 +238,9 @@
  tech_gray_army_7:0 "§Y自演化纳米战体§!"
  tech_gray_army_7_desc:0 "通过植入一些低级自演化程序，结合对纳米物质的了解，我们能够小批量生产一些纳米战体作为陆军投放。"
 
+ tech_gray_juggernaut_8:0 "§Y纳米超宏舰系统§!"
+ tech_gray_juggernaut_8_desc:0 "纳米物质的自构特性使得它们能够用来建造一些规模无以伦比的工程。而我们将踏出第一步。"
+
  RG_PLANET_KILLER:0 "§H远星之歌§!"
  RG_PLANET_KILLER_DESC:0 "§Y发射高能级纳米射线蒸发行星大气，彻底污染星球上所有物体。以恒星级功率发射时，剧烈的扰动将摧毁恒星引发超新星爆炸，并污染星系中所有行星。若将能量重定向到敌舰上，将造成难以置信的伤害。§!"
  RG_PLANET_KILLER_ACTION:0 "§H纳米注入§!"