diff --git a/events/!_RG_gray_goo_events.txt b/events/!_RG_gray_goo_events.txt
index d071853..d3662a5 100644
--- a/events/!_RG_gray_goo_events.txt
+++ b/events/!_RG_gray_goo_events.txt
@@ -622,12 +622,9 @@ event = {
 					}
 				}
 				AND = {
-					OR = {
-						has_country_flag = gray_official_active
-						has_country_flag = gray_governor_active #旧版flag
-					}
+					has_country_flag = gray_official_active
 					NOT = {
-						exists = event_target:gray_governor
+						exists = event_target:gray_official
 					}
 				}
 				AND = {
@@ -641,10 +638,8 @@ event = {
 	}
 	immediate = {
 		event_target:gray_owner = {
-			OR = {
-				has_country_flag = gray_official_active
-				has_country_flag = gray_governor_active #旧版flag
-			}			#总督
+			remove_country_flag = gray_official_active #新版flag
+			remove_country_flag = gray_governor_active #旧版flag	#总督
 			remove_country_flag = gray_warship_active			#旗舰
 			remove_country_flag = gray_army_active			#陆军
 			remove_country_flag = gray_constship_active			#科舰
@@ -653,12 +648,8 @@ event = {
 				modifier = "gray_scattered"
 				days = 3600
 			}
-			country_event = {
-				id = graygoo.511
-			}
-			country_event = {
-				id = rg_event.22
-			}
+			country_event = { id = graygoo.511 }
+			country_event = { id = graygoo.512 days = 3600 }
 		}
 	}
 }
@@ -683,11 +674,20 @@ country_event = {
 	desc = "graygoo.512.a.desc"
 	desc = "graygoo.512.b.desc"
 	desc = "graygoo.512.c.desc"
-	diplomatic = yes
+
+	event_window_type = leader_story
+	picture = GFX_evt_gray_gooed_planet
+	picture_event_data = {
+		portrait = event_target:rg_gray_country_leader
+		room = root
+	}
+
 	is_triggered_only = yes
+
 	immediate = {
 		remove_country_flag = gray_reforming
 	}
+
 	option = {
 		name = graygoo.512.a
 	}
diff --git a/events/RG_events.txt b/events/RG_events.txt
index 0af18e5..3b36265 100644
--- a/events/RG_events.txt
+++ b/events/RG_events.txt
@@ -1041,35 +1041,35 @@ country_event = {
 	}
 }
 
-# looping check for grayreforming
-country_event = {
-	id = rg_event.22
-	hide_window = yes
-	is_triggered_only = yes
-	trigger = {
-		is_same_value = event_target:gray_owner
-		has_country_flag = gray_reforming
-	}
-	immediate = {
-		if = {
-			limit = {
-				NOT = {
-					has_modifier = "gray_scattered"
-				}
-			}
-			country_event = {
-				id = graygoo.512
-			}
-		}
-		else = {
-			country_event = {
-				id = rg_event.22
-				years = 1
-			}
-			# *THIS* looping check
-		}
-	}
-}
+# # looping check for grayreforming
+# country_event = {
+# 	id = rg_event.22
+# 	hide_window = yes
+# 	is_triggered_only = yes
+# 	trigger = {
+# 		is_same_value = event_target:gray_owner
+# 		has_country_flag = gray_reforming
+# 	}
+# 	immediate = {
+# 		if = {
+# 			limit = {
+# 				NOT = {
+# 					has_modifier = "gray_scattered"
+# 				}
+# 			}
+# 			country_event = {
+# 				id = graygoo.512
+# 			}
+# 		}
+# 		else = {
+# 			country_event = {
+# 				id = rg_event.22
+# 				years = 1
+# 			}
+# 			# *THIS* looping check
+# 		}
+# 	}
+# }
 
 # 拆毁工厂小灰通讯
 country_event = {
diff --git a/events/RG_gray_leader_event.txt b/events/RG_gray_leader_event.txt
index 1af3daf..0cc74d6 100644
--- a/events/RG_gray_leader_event.txt
+++ b/events/RG_gray_leader_event.txt
@@ -1156,28 +1156,28 @@ country_event = {
 	option = {
 		name = OK
 	}
-	option = {
-		name = rg_graygoo.504.a
-		allow = {
-			has_country_flag = gray_reforming
-			resource_stockpile_compare = {
-				resource = nanites
-				value >= 1000
-			}
-			resource_stockpile_compare = {
-				resource = alloys
-				value >= 50000
-			}
-		}
-		add_resource = {
-			nanites = -1000
-			alloys = -50000
-		}
-		remove_modifier = "gray_scattered"
-		country_event = {
-			id = graygoo.512
-		}
-	}
+	# option = {
+	# 	name = rg_graygoo.504.a
+	# 	allow = {
+	# 		has_country_flag = gray_reforming
+	# 		resource_stockpile_compare = {
+	# 			resource = nanites
+	# 			value >= 1000
+	# 		}
+	# 		resource_stockpile_compare = {
+	# 			resource = alloys
+	# 			value >= 50000
+	# 		}
+	# 	}
+	# 	add_resource = {
+	# 		nanites = -1000
+	# 		alloys = -50000
+	# 	}
+	# 	remove_modifier = "gray_scattered"
+	# 	country_event = {
+	# 		id = graygoo.512
+	# 	}
+	# }
 }
 
 # Main Menu (const)
diff --git a/events/RG_wsg_graygoo_event.txt b/events/RG_wsg_graygoo_event.txt
index f3dfe85..4e3ba30 100644
--- a/events/RG_wsg_graygoo_event.txt
+++ b/events/RG_wsg_graygoo_event.txt
@@ -1225,28 +1225,28 @@ country_event = {
 			}
 		}
 	}
-	option = {
-		name = rg_graygoo.504.a
-		allow = {
-			has_country_flag = gray_reforming
-			resource_stockpile_compare = {
-				resource = nanites
-				value >= 1000
-			}
-			resource_stockpile_compare = {
-				resource = alloys
-				value >= 50000
-			}
-		}
-		add_resource = {
-			nanites = -1000
-			alloys = -50000
-		}
-		remove_modifier = "gray_scattered"
-		country_event = {
-			id = graygoo.512
-		}
-	}
+	# option = {
+	# 	name = rg_graygoo.504.a
+	# 	allow = {
+	# 		has_country_flag = gray_reforming
+	# 		resource_stockpile_compare = {
+	# 			resource = nanites
+	# 			value >= 1000
+	# 		}
+	# 		resource_stockpile_compare = {
+	# 			resource = alloys
+	# 			value >= 50000
+	# 		}
+	# 	}
+	# 	add_resource = {
+	# 		nanites = -1000
+	# 		alloys = -50000
+	# 	}
+	# 	remove_modifier = "gray_scattered"
+	# 	country_event = {
+	# 		id = graygoo.512
+	# 	}
+	# }
 }
 
 # Main Menu (const)