diff --git a/src/common/military_industrial_organization/organizations/DOH_organization.txt b/src/common/military_industrial_organization/organizations/DOH_organization.txt
index b1c496b..0db6155 100755
--- a/src/common/military_industrial_organization/organizations/DOH_organization.txt
+++ b/src/common/military_industrial_organization/organizations/DOH_organization.txt
@@ -101,7 +101,7 @@ DOH_baotoudiyijixiechang_organization = {
 			controls_state = 621
 			OR = {
 				has_completed_focus = DOH_xindonghuang
-				has_completed_focus = DOH_yixianwansui
+				has_completed_focus = DOH_donghuangdeyewang
 			}
 			has_completed_focus = DOH_donghuanggongyetixi
 		}
@@ -303,7 +303,7 @@ DOH_dalianzaochuan_organization = {
 			controls_state = 745
 			OR = {
 				has_completed_focus = DOH_xindonghuang
-				has_completed_focus = DOH_yixianwansui
+				has_completed_focus = DOH_donghuangdeyewang
 			}
 		}
 	}
@@ -473,7 +473,7 @@ DOH_hudong_organization = {
 			controls_state = 613
 			OR = {
 				has_completed_focus = DOH_xindonghuang
-				has_completed_focus = DOH_yixianwansui
+				has_completed_focus = DOH_donghuangdeyewang
 			}
 		}
 	}
@@ -641,7 +641,7 @@ DOH_wuchangzaochuanchang_organization = {
 			controls_state = 620
 			OR = {
 				has_completed_focus = DOH_xindonghuang
-				has_completed_focus = DOH_yixianwansui
+				has_completed_focus = DOH_donghuangdeyewang
 			}
 		}
 	}
@@ -957,7 +957,7 @@ DOH_dagu_shipyard_organization = {
 		owner = {
 			OR = {
 				has_completed_focus = DOH_xindonghuang
-				has_completed_focus = DOH_yixianwansui
+				has_completed_focus = DOH_donghuangdeyewang
 			}
 		}
 	}
@@ -971,7 +971,7 @@ DOH_dagu_shipyard_organization = {
 #    ### #  # #  # ### ##  
 ###########################
 DOH_camco_medium_organization = {
-	include = generic_medium_aircraft_organization
+	include = generic_multi_role_aircraft_organization
 	icon = GFX_idea_CHI_camco
 	allowed = {
 		tag = DOH
@@ -980,7 +980,7 @@ DOH_camco_medium_organization = {
 		owner = {
 			OR = {
 				has_completed_focus = DOH_xindonghuang
-				has_completed_focus = DOH_yixianwansui
+				has_completed_focus = DOH_donghuangdeyewang
 			}
 			has_completed_focus = DOH_duidizhiyuan
 		}
@@ -988,7 +988,7 @@ DOH_camco_medium_organization = {
 }
 
 DOH_camco_fighter_organization = {
-	include = generic_light_aircraft_organization
+	include = generic_high_agility_fighter_aircraft_organization
 	icon = GFX_idea_CHI_camco
 	allowed = {
 		tag = DOH
@@ -997,7 +997,7 @@ DOH_camco_fighter_organization = {
 		owner = {
 			OR = {
 				has_completed_focus = DOH_xindonghuang
-				has_completed_focus = DOH_yixianwansui
+				has_completed_focus = DOH_donghuangdeyewang
 			}
 			has_completed_focus = DOH_tieyuan
 		}
@@ -1014,7 +1014,7 @@ DOH_camco_cas_organization = {
 		owner = {
 			OR = {
 				has_completed_focus = DOH_xindonghuang
-				has_completed_focus = DOH_yixianwansui
+				has_completed_focus = DOH_donghuangdeyewang
 			}
 			has_completed_focus = DOH_duidizhiyuan
 		}
@@ -1031,7 +1031,7 @@ DOH_camco_heavy_organization = {
 		owner = {
 			OR = {
 				has_completed_focus = DOH_xindonghuang
-				has_completed_focus = DOH_yixianwansui
+				has_completed_focus = DOH_donghuangdeyewang
 			}
 			has_completed_focus = DOH_duidizhiyuan
 			OR = {
@@ -1059,7 +1059,7 @@ DOH_taiyuan_arsenal_organization = {
 			controls_state = 615
 			OR = {
 				has_completed_focus = DOH_xindonghuang
-				has_completed_focus = DOH_yixianwansui
+				has_completed_focus = DOH_donghuangdeyewang
 			}
 		}
 	}
@@ -1194,7 +1194,7 @@ DOH_liaoning_arsenal_organization = {
 			controls_state = 715
 			OR = {
 				has_completed_focus = DOH_xindonghuang
-				has_completed_focus = DOH_yixianwansui
+				has_completed_focus = DOH_donghuangdeyewang
 			}
 		}
 	}
@@ -1239,7 +1239,7 @@ DOH_hanyan_arsenal_organization = {
 			controls_state = 620
 			OR = {
 				has_completed_focus = DOH_xindonghuang
-				has_completed_focus = DOH_yixianwansui
+				has_completed_focus = DOH_donghuangdeyewang
 			}
 		}
 	}
@@ -1344,7 +1344,7 @@ DOH_mukden_arsenal_organization = {
 			controls_state = 716
 			OR = {
 				has_completed_focus = DOH_xindonghuang
-				has_completed_focus = DOH_yixianwansui
+				has_completed_focus = DOH_donghuangdeyewang
 			}
 		}
 	}
diff --git a/src/common/mtth/az_DOH_mtth.txt b/src/common/mtth/az_DOH_mtth.txt
index 274f8ae..420fb43 100755
--- a/src/common/mtth/az_DOH_mtth.txt
+++ b/src/common/mtth/az_DOH_mtth.txt
@@ -30,28 +30,26 @@ DOH_zongjikaizhi_mtth = {
 	}
 }
 DOH_guimoxiaoyin_mtth = {
-	base = 0
+	base = 0.01
 	modifier = {
-		AND = {
-			DOH = {
-				has_completed_focus = DOH_donghuanggongyetixi
-			}
-			DOH = {
-				num_of_factories > 299
-			}
-		}
-		add = DOH.num_of_civilian_factories
+		always = yes
+		set_temp_variable = { t = DOH.num_of_civilian_factories }
+		add_to_temp_variable = { t = -299 }
+		add = t
 	}
 	modifier = {
-		AND = {
+		NOT = {
 			DOH = {
 				has_completed_focus = DOH_donghuanggongyetixi
 			}
-			DOH = {
-				num_of_factories > 299
-			}
 		}
-		add = -299
+		factor = 0
+	}
+	modifier = {
+		DOH = {
+			num_of_civilian_factories < 300
+		}
+		factor = 0
 	}
 	modifier = {
 		always = yes
@@ -104,7 +102,7 @@ DOH_gexinshengchanli_mtth = {
 	}
 }
 DOH_heqishengcai_mtth = {
-	base = 0
+	base = 0.01
 	modifier = {
 		has_completed_focus = DOH_heqishengcai
 		set_temp_variable = {
@@ -129,7 +127,7 @@ DOH_heqishengcai_mtth = {
 
 # 总计消费品
 DOH_xiaofeipingyinxiang_mtth = {
-	base = 0
+	base = 0.01
 	modifier = {
 		always = yes
 		set_temp_variable = {
@@ -327,7 +325,7 @@ DOH_modifier_shichang_effect_1_mtth = {
 
 ## 工业目标
 DOH_gongyemubiao_mtth = {
-	base = 0
+	base = 0.01
 	modifier = {
 		always = yes
 		set_temp_variable = {
diff --git a/src/common/national_focus/donghuang_new.txt b/src/common/national_focus/donghuang_new.txt
index f4f4075..1b55628 100755
--- a/src/common/national_focus/donghuang_new.txt
+++ b/src/common/national_focus/donghuang_new.txt
@@ -1695,6 +1695,11 @@ focus_tree = {
 			focus = DOH_zhenhaidetiyi
 			focus = DOH_haerbindejianyi
 		}
+		available = {
+			NOT = {
+				has_completed_focus = DOH_haerbindayuanshuai
+			}
+		}
 		x = -2
 		y = 3
 		completion_reward = {
@@ -1723,6 +1728,11 @@ focus_tree = {
 			focus = DOH_pinghaidejunduijianshefangan
 			focus = DOH_haerbindejianyi
 		}
+		available = {
+			NOT = {
+				has_completed_focus = DOH_haerbindayuanshuai
+			}
+		}
 		x = 0
 		y = 3
 		completion_reward = {
@@ -1754,6 +1764,11 @@ focus_tree = {
 			focus = DOH_pinghaidejunduijianshefangan
 			focus = DOH_zhenhaidetiyi
 		}
+		available = {
+			NOT = {
+				has_completed_focus = DOH_haerbindayuanshuai
+			}
+		}
 		x = 2
 		y = 3
 		completion_reward = {
@@ -2997,7 +3012,7 @@ focus_tree = {
 				has_idea = DOH_dfgg4
 				has_idea = DOH_dfgg5
 			}
-			has_completed_focus = DOH_yixianwansui
+			has_completed_focus = DOH_donghuangdeyewang
 		}
 		ai_will_do = {
 			factor = 10
@@ -3268,7 +3283,7 @@ focus_tree = {
 					democratic > 0.5
 				}
 				AND = {
-					has_completed_focus = DOH_yixianwansui
+					has_completed_focus = DOH_donghuangdeyewang
 					fascism > 0.5
 				}
 				hidden_trigger = {
@@ -3290,7 +3305,7 @@ focus_tree = {
 					}
 					if = {
 						limit = {
-							has_completed_focus = DOH_yixianwansui
+							has_completed_focus = DOH_donghuangdeyewang
 						}
 						add_popularity = {
 							ideology = fascism
@@ -3343,7 +3358,7 @@ focus_tree = {
 					democratic > 0.8
 				}
 				AND = {
-					has_completed_focus = DOH_yixianwansui
+					has_completed_focus = DOH_donghuangdeyewang
 					fascism > 0.8
 				}
 				hidden_trigger = {
@@ -3366,7 +3381,7 @@ focus_tree = {
 					}
 					if = {
 						limit = {
-							has_completed_focus = DOH_yixianwansui
+							has_completed_focus = DOH_donghuangdeyewang
 						}
 						add_popularity = {
 							ideology = fascism
@@ -4285,7 +4300,7 @@ focus_tree = {
 			factor = 6
 		}
 		bypass = {
-			has_completed_focus = DOH_yixianwansui
+			has_completed_focus = DOH_donghuangdeyewang
 		}
 		completion_reward = {
 			add_timed_idea = {
@@ -4461,7 +4476,7 @@ focus_tree = {
 		available = {
 			OR = {
 				has_idea = DOH_dhzztx
-				has_completed_focus = DOH_yixianwansui
+				has_completed_focus = DOH_donghuangdeyewang
 			}
 		}
 		relative_position_id = DOH_gaodengxuefu
@@ -4484,7 +4499,7 @@ focus_tree = {
 				}
 				if = {
 					limit = {
-						has_completed_focus = DOH_yixianwansui
+						has_completed_focus = DOH_donghuangdeyewang
 					}
 					remove_ideas = DOH_mzkq
 					remove_ideas = DOH_donghuangyikedaxue_idea
@@ -4617,7 +4632,7 @@ focus_tree = {
 		cost = 5
 		available = {
 			OR = {
-				has_completed_focus = DOH_yixianwansui
+				has_completed_focus = DOH_donghuangdeyewang
 				has_completed_focus = DOH_weidalingxiu
 			}
 		}
@@ -4643,7 +4658,7 @@ focus_tree = {
 		}
 		available = {
 			OR = {
-				has_completed_focus = DOH_yixianwansui
+				has_completed_focus = DOH_donghuangdeyewang
 				has_completed_focus = DOH_weidalingxiu
 			}
 		}
@@ -6162,7 +6177,7 @@ focus_tree = {
 		available = {
 			OR = {
 				has_completed_focus = DOH_xindonghuang
-				has_completed_focus = DOH_yixianwansui
+				has_completed_focus = DOH_donghuangdeyewang
 			}
 		}
 		ai_will_do = {
diff --git a/src/common/scripted_effects/az_DOH_scripted_effects.txt b/src/common/scripted_effects/az_DOH_scripted_effects.txt
index 9e72aea..0bcf627 100755
--- a/src/common/scripted_effects/az_DOH_scripted_effects.txt
+++ b/src/common/scripted_effects/az_DOH_scripted_effects.txt
@@ -188,9 +188,15 @@ DOH_modifier_effect = {
 }
 
 DOH_zhichilvchengfa_effect = {
+	set_variable = {
+		DOH_zhichiduchengfa_t = var:DOH_zhichiduchengfa
+	}
+	multiply_variable = {
+		DOH_zhichiduchengfa_t = -0.01
+	}
 	add_popularity = {
 		ideology = neutrality
-		popularity = var:DOH_zhichiduchengfa
+		popularity = var:DOH_zhichiduchengfa_t
 	}
 }
 
diff --git a/src/events/DOH_shijian.txt b/src/events/DOH_shijian.txt
index 1571c5b..ec7ddfd 100755
--- a/src/events/DOH_shijian.txt
+++ b/src/events/DOH_shijian.txt
@@ -1220,6 +1220,7 @@ country_event = {
 }
 country_event = {
 	id = DOH_loong_event.2002
+	picture = GFX_aze_hit
 	title = DOH_loong_event.2002.t
 	desc = DOH_loong_event.2002.d
 	is_triggered_only = yes
@@ -1339,6 +1340,7 @@ country_event = {
 	id = DOH_loong_event.3001
 	title = DOH_loong_event.3001.t
 	desc = DOH_loong_event.3001.d
+	picture = GFX_aze_cy1
 	is_triggered_only = yes
 	option = {
 		name = DOH_loong_event.3001.a
@@ -1430,6 +1432,7 @@ country_event = {
 	id = DOH_loong_event.3002
 	title = DOH_loong_event.3002.t
 	desc = DOH_loong_event.3002.d
+	picture = GFX_az_doh_event
 	trigger = {
 		AND = {
 			tag = DOH
@@ -1481,6 +1484,7 @@ country_event = {
 	id = DOH_loong_event.4001
 	title = DOH_loong_event.4001.t
 	desc = DOH_loong_event.4001.d
+	picture = GFX_az_doh_huajia
 	is_triggered_only = yes
 	option = {
 		name = DOH_loong_event.4001.a
@@ -1520,6 +1524,7 @@ country_event = {
 	title = DOH_loong_event.4002.t
 	desc = DOH_loong_event.4002.d
 	is_triggered_only = yes
+	picture = GFX_az_doh_huajia
 	option = {
 		name = DOH_loong_event.4002.a
 		ai_chance = {
@@ -1545,6 +1550,7 @@ country_event = {
 	id = DOH_loong_event.4003
 	title = DOH_loong_event.4003.t
 	desc = DOH_loong_event.4003.d
+	picture = GFX_az_doh_huajia
 	is_triggered_only = yes
 	option = {
 		name = DOH_loong_event.4003.a
@@ -1565,6 +1571,8 @@ country_event = {
 	id = DOH_loong_event.5001
 	title = DOH_loong_event.5001.t
 	desc = DOH_loong_event.5001.d
+	picture = GFX_az_doh_event
+
 	is_triggered_only = yes
 	option = {
 		name = DOH_loong_event.5001.aa
@@ -1604,6 +1612,7 @@ country_event = {
 	id = DOH_loong_event.5101
 	title = DOH_loong_event.5101.t
 	desc = DOH_loong_event.5101.d
+	picture = GFX_az_doh_event
 	is_triggered_only = yes
 	option = {
 		name = DOH_loong_event.5101.aa
diff --git a/src/gfx/event_pictures/az_doh_huajia.png b/src/gfx/event_pictures/az_doh_huajia.png
new file mode 100755
index 0000000..b59f710
Binary files /dev/null and b/src/gfx/event_pictures/az_doh_huajia.png differ
diff --git a/src/gfx/event_pictures/aze_doh_event.png b/src/gfx/event_pictures/aze_doh_event.png
new file mode 100755
index 0000000..c20689a
Binary files /dev/null and b/src/gfx/event_pictures/aze_doh_event.png differ
diff --git a/src/interface/az_eventpictures.gfx b/src/interface/az_eventpictures.gfx
index cce3578..d210309 100755
--- a/src/interface/az_eventpictures.gfx
+++ b/src/interface/az_eventpictures.gfx
@@ -391,6 +391,14 @@ spriteTypes = {
 		name = "GFX_aze_huayuan" 
 		texturefile = "gfx/event_pictures/aze_huayuan.png"  
 	}
+	spriteType = {
+		name = "GFX_az_doh_huajia" 
+		texturefile = "gfx/event_pictures/az_doh_huajia.png" 
+	}
+	spriteType = {
+		name = "GFX_az_doh_event" 
+		texturefile = "gfx/event_pictures/aze_doh_event.png" 
+	}
 	frameAnimatedSpriteType = {
 		name = "GFX_az_huayuan"
 		texturefile = "gfx/event_pictures/az_huayuan.png" 
diff --git a/src/interface/az_goals_shine.gfx b/src/interface/az_goals_shine.gfx
index d880792..9dc8710 100755
--- a/src/interface/az_goals_shine.gfx
+++ b/src/interface/az_goals_shine.gfx
@@ -2945,4 +2945,221 @@ spriteTypes = {
 		}
 		legacy_lazy_load = no
 	}
+	SpriteType = {
+		name = "GFX_goal_liberty_shine" 
+		texturefile = "gfx/interface/goals/goal_liberty.png"			
+		effectFile = "gfx/FX/buttonstate.lua"
+		animation = {
+			animationmaskfile = "gfx/interface/goals/goal_liberty.png"			
+			animationtexturefile = "gfx/interface/goals/shine_overlay.dds" 	# <- the animated file
+			animationrotation = -90.0		# -90 clockwise 90 counterclockwise(by default)
+			animationlooping = no			# yes or no ;)
+			animationtime = 0.75				# in seconds
+			animationdelay = 0			# in seconds
+			animationblendmode = "add"       #add, multiply, overlay
+			animationtype = "scrolling"      #scrolling, rotating, pulsing
+			animationrotationoffset = { x = 0.0 y = 0.0 }
+			animationtexturescale = { x = 1.0 y = 1.0 } 
+		}
+
+		animation = {
+			animationmaskfile = "gfx/interface/goals/goal_liberty.png"			
+			animationtexturefile = "gfx/interface/goals/shine_overlay.dds" 	# <- the animated file
+			animationrotation = 90.0		# -90 clockwise 90 counterclockwise(by default)
+			animationlooping = no			# yes or no ;)
+			animationtime = 0.75				# in seconds
+			animationdelay = 0			# in seconds
+			animationblendmode = "add"       #add, multiply, overlay
+			animationtype = "scrolling"      #scrolling, rotating, pulsing
+			animationrotationoffset = { x = 0.0 y = 0.0 }
+			animationtexturescale = { x = 1.0 y = 1.0 } 
+		}
+		legacy_lazy_load = no
+	}
+	SpriteType = {
+		name = "GFX_focus_anshan_shine" 
+		texturefile = "gfx/interface/goals/focus_anshan.png"			
+		effectFile = "gfx/FX/buttonstate.lua"
+		animation = {
+			animationmaskfile = "gfx/interface/goals/focus_anshan.png"			
+			animationtexturefile = "gfx/interface/goals/shine_overlay.dds" 	# <- the animated file
+			animationrotation = -90.0		# -90 clockwise 90 counterclockwise(by default)
+			animationlooping = no			# yes or no ;)
+			animationtime = 0.75				# in seconds
+			animationdelay = 0			# in seconds
+			animationblendmode = "add"       #add, multiply, overlay
+			animationtype = "scrolling"      #scrolling, rotating, pulsing
+			animationrotationoffset = { x = 0.0 y = 0.0 }
+			animationtexturescale = { x = 1.0 y = 1.0 } 
+		}
+
+		animation = {
+			animationmaskfile = "gfx/interface/goals/focus_anshan.png"			
+			animationtexturefile = "gfx/interface/goals/shine_overlay.dds" 	# <- the animated file
+			animationrotation = 90.0		# -90 clockwise 90 counterclockwise(by default)
+			animationlooping = no			# yes or no ;)
+			animationtime = 0.75				# in seconds
+			animationdelay = 0			# in seconds
+			animationblendmode = "add"       #add, multiply, overlay
+			animationtype = "scrolling"      #scrolling, rotating, pulsing
+			animationrotationoffset = { x = 0.0 y = 0.0 }
+			animationtexturescale = { x = 1.0 y = 1.0 } 
+		}
+		legacy_lazy_load = no
+	}
+	SpriteType = {
+		name = "GFX_focus_zhenhai_shine" 
+		texturefile = "gfx/interface/goals/focus_zhenhai.png"			
+		effectFile = "gfx/FX/buttonstate.lua"
+		animation = {
+			animationmaskfile = "gfx/interface/goals/focus_zhenhai.png"			
+			animationtexturefile = "gfx/interface/goals/shine_overlay.dds" 	# <- the animated file
+			animationrotation = -90.0		# -90 clockwise 90 counterclockwise(by default)
+			animationlooping = no			# yes or no ;)
+			animationtime = 0.75				# in seconds
+			animationdelay = 0			# in seconds
+			animationblendmode = "add"       #add, multiply, overlay
+			animationtype = "scrolling"      #scrolling, rotating, pulsing
+			animationrotationoffset = { x = 0.0 y = 0.0 }
+			animationtexturescale = { x = 1.0 y = 1.0 } 
+		}
+
+		animation = {
+			animationmaskfile = "gfx/interface/goals/focus_zhenhai.png"			
+			animationtexturefile = "gfx/interface/goals/shine_overlay.dds" 	# <- the animated file
+			animationrotation = 90.0		# -90 clockwise 90 counterclockwise(by default)
+			animationlooping = no			# yes or no ;)
+			animationtime = 0.75				# in seconds
+			animationdelay = 0			# in seconds
+			animationblendmode = "add"       #add, multiply, overlay
+			animationtype = "scrolling"      #scrolling, rotating, pulsing
+			animationrotationoffset = { x = 0.0 y = 0.0 }
+			animationtexturescale = { x = 1.0 y = 1.0 } 
+		}
+		legacy_lazy_load = no
+	}
+	SpriteType = {
+		name = "GFX_focus_haerbin_shine" 
+		texturefile = "gfx/interface/goals/focus_haerbin.png"			
+		effectFile = "gfx/FX/buttonstate.lua"
+		animation = {
+			animationmaskfile = "gfx/interface/goals/focus_haerbin.png"			
+			animationtexturefile = "gfx/interface/goals/shine_overlay.dds" 	# <- the animated file
+			animationrotation = -90.0		# -90 clockwise 90 counterclockwise(by default)
+			animationlooping = no			# yes or no ;)
+			animationtime = 0.75				# in seconds
+			animationdelay = 0			# in seconds
+			animationblendmode = "add"       #add, multiply, overlay
+			animationtype = "scrolling"      #scrolling, rotating, pulsing
+			animationrotationoffset = { x = 0.0 y = 0.0 }
+			animationtexturescale = { x = 1.0 y = 1.0 } 
+		}
+
+		animation = {
+			animationmaskfile = "gfx/interface/goals/focus_haerbin.png"			
+			animationtexturefile = "gfx/interface/goals/shine_overlay.dds" 	# <- the animated file
+			animationrotation = 90.0		# -90 clockwise 90 counterclockwise(by default)
+			animationlooping = no			# yes or no ;)
+			animationtime = 0.75				# in seconds
+			animationdelay = 0			# in seconds
+			animationblendmode = "add"       #add, multiply, overlay
+			animationtype = "scrolling"      #scrolling, rotating, pulsing
+			animationrotationoffset = { x = 0.0 y = 0.0 }
+			animationtexturescale = { x = 1.0 y = 1.0 } 
+		}
+		legacy_lazy_load = no
+	}
+	SpriteType = {
+		name = "GFX_focus_another_yixian_shine" 
+		texturefile = "gfx/interface/goals/focus_another_yixian.png"			
+		effectFile = "gfx/FX/buttonstate.lua"
+		animation = {
+			animationmaskfile = "gfx/interface/goals/focus_another_yixian.png"			
+			animationtexturefile = "gfx/interface/goals/shine_overlay.dds" 	# <- the animated file
+			animationrotation = -90.0		# -90 clockwise 90 counterclockwise(by default)
+			animationlooping = no			# yes or no ;)
+			animationtime = 0.75				# in seconds
+			animationdelay = 0			# in seconds
+			animationblendmode = "add"       #add, multiply, overlay
+			animationtype = "scrolling"      #scrolling, rotating, pulsing
+			animationrotationoffset = { x = 0.0 y = 0.0 }
+			animationtexturescale = { x = 1.0 y = 1.0 } 
+		}
+
+		animation = {
+			animationmaskfile = "gfx/interface/goals/focus_another_yixian.png"			
+			animationtexturefile = "gfx/interface/goals/shine_overlay.dds" 	# <- the animated file
+			animationrotation = 90.0		# -90 clockwise 90 counterclockwise(by default)
+			animationlooping = no			# yes or no ;)
+			animationtime = 0.75				# in seconds
+			animationdelay = 0			# in seconds
+			animationblendmode = "add"       #add, multiply, overlay
+			animationtype = "scrolling"      #scrolling, rotating, pulsing
+			animationrotationoffset = { x = 0.0 y = 0.0 }
+			animationtexturescale = { x = 1.0 y = 1.0 } 
+		}
+		legacy_lazy_load = no
+	}
+	SpriteType = {
+		name = "GFX_focus_taiyuan_shine" 
+		texturefile = "gfx/interface/goals/focus_taiyuan.png"			
+		effectFile = "gfx/FX/buttonstate.lua"
+		animation = {
+			animationmaskfile = "gfx/interface/goals/focus_taiyuan.png"			
+			animationtexturefile = "gfx/interface/goals/shine_overlay.dds" 	# <- the animated file
+			animationrotation = -90.0		# -90 clockwise 90 counterclockwise(by default)
+			animationlooping = no			# yes or no ;)
+			animationtime = 0.75				# in seconds
+			animationdelay = 0			# in seconds
+			animationblendmode = "add"       #add, multiply, overlay
+			animationtype = "scrolling"      #scrolling, rotating, pulsing
+			animationrotationoffset = { x = 0.0 y = 0.0 }
+			animationtexturescale = { x = 1.0 y = 1.0 } 
+		}
+
+		animation = {
+			animationmaskfile = "gfx/interface/goals/focus_taiyuan.png"			
+			animationtexturefile = "gfx/interface/goals/shine_overlay.dds" 	# <- the animated file
+			animationrotation = 90.0		# -90 clockwise 90 counterclockwise(by default)
+			animationlooping = no			# yes or no ;)
+			animationtime = 0.75				# in seconds
+			animationdelay = 0			# in seconds
+			animationblendmode = "add"       #add, multiply, overlay
+			animationtype = "scrolling"      #scrolling, rotating, pulsing
+			animationrotationoffset = { x = 0.0 y = 0.0 }
+			animationtexturescale = { x = 1.0 y = 1.0 } 
+		}
+		legacy_lazy_load = no
+	}
+	SpriteType = {
+		name = "GFX_focus_pinghai_shine" 
+		texturefile = "gfx/interface/goals/focus_pinghai.png"			
+		effectFile = "gfx/FX/buttonstate.lua"
+		animation = {
+			animationmaskfile = "gfx/interface/goals/focus_pinghai.png"			
+			animationtexturefile = "gfx/interface/goals/shine_overlay.dds" 	# <- the animated file
+			animationrotation = -90.0		# -90 clockwise 90 counterclockwise(by default)
+			animationlooping = no			# yes or no ;)
+			animationtime = 0.75				# in seconds
+			animationdelay = 0			# in seconds
+			animationblendmode = "add"       #add, multiply, overlay
+			animationtype = "scrolling"      #scrolling, rotating, pulsing
+			animationrotationoffset = { x = 0.0 y = 0.0 }
+			animationtexturescale = { x = 1.0 y = 1.0 } 
+		}
+
+		animation = {
+			animationmaskfile = "gfx/interface/goals/focus_pinghai.png"			
+			animationtexturefile = "gfx/interface/goals/shine_overlay.dds" 	# <- the animated file
+			animationrotation = 90.0		# -90 clockwise 90 counterclockwise(by default)
+			animationlooping = no			# yes or no ;)
+			animationtime = 0.75				# in seconds
+			animationdelay = 0			# in seconds
+			animationblendmode = "add"       #add, multiply, overlay
+			animationtype = "scrolling"      #scrolling, rotating, pulsing
+			animationrotationoffset = { x = 0.0 y = 0.0 }
+			animationtexturescale = { x = 1.0 y = 1.0 } 
+		}
+		legacy_lazy_load = no
+	}
 }
diff --git a/src/localisation/simp_chinese/az_organization_l_simp_chinese.yml b/src/localisation/simp_chinese/az_organization_l_simp_chinese.yml
index 66d6636..3273c93 100755
--- a/src/localisation/simp_chinese/az_organization_l_simp_chinese.yml
+++ b/src/localisation/simp_chinese/az_organization_l_simp_chinese.yml
@@ -1,6 +1,6 @@
 l_simp_chinese:
   ##东煌军工组织##
-  DOH_shanghai_tank: "上海联合装甲设计局"
+  DOH_shanghai_tank: "上海联合装甲研究所"
   DOH_baotoudiyijixiechang_organization: "包头第一机械厂"
   DOH_dalianzaochuan_organization: "大连造船厂"
   DOH_wuchangzaochuanchang_organization: "武昌船舶研究所"