diff --git a/binaries/data/mods/public/art/actors/props/units/shields/kart_round_isp_basic.xml b/binaries/data/mods/public/art/actors/props/units/shields/kart_round_isp_basic.xml
index 45c2783a8c..0f9766e801 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/kart_round_isp_basic.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/kart_round_isp_basic.xml
@@ -11,16 +11,29 @@
   </group>
   <group>
     <variant frequency="1" name="kart-shield-d">
-      <textures><texture file="props/shield/kart_round_d.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="props/shield/kart_round_d.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="kart-shield-i">
-      <textures><texture file="props/shield/kart_round_i.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="props/shield/kart_round_i.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="kart-shield-j">
-      <textures><texture file="props/shield/kart_round_j.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="props/shield/kart_round_j.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="kart-shield-p">
-      <textures><texture file="props/shield/kart_round_p.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="props/shield/kart_round_p.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="aspis-plain">
+      <textures>
+        <texture file="props/shield/aspis_player_plain.png" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <material>playercolor_spec.xml</material>
diff --git a/binaries/data/mods/public/art/actors/structures/carthaginians/tophet.xml b/binaries/data/mods/public/art/actors/structures/carthaginians/tophet.xml
index a240f50c6a..7b5f5d28ec 100644
--- a/binaries/data/mods/public/art/actors/structures/carthaginians/tophet.xml
+++ b/binaries/data/mods/public/art/actors/structures/carthaginians/tophet.xml
@@ -5,10 +5,14 @@
     <variant frequency="100" name="Carthage Tophet">
       <mesh>structural/kart_tophet.dae</mesh>
       <props>
-        <prop actor="particle/flame.xml" attachpoint="fire1"/>
-        <prop actor="particle/flame.xml" attachpoint="fire2"/>
-        <prop actor="particle/smoke.xml" attachpoint="fire1"/>
-        <prop actor="particle/smoke.xml" attachpoint="fire2"/>
+        <prop actor="particle/sparks.xml" attachpoint="fire1"/>
+        <prop actor="particle/flame_firepit_1.xml" attachpoint="fire1"/>
+        <prop actor="particle/flame_firepit_2.xml" attachpoint="fire1"/>
+        <prop actor="particle/smoke_small_light.xml" attachpoint="fire1"/>
+        <prop actor="particle/sparks.xml" attachpoint="fire2"/>
+        <prop actor="particle/flame_firepit_1.xml" attachpoint="fire2"/>
+        <prop actor="particle/flame_firepit_2.xml" attachpoint="fire2"/>
+        <prop actor="particle/smoke_small_light.xml" attachpoint="fire2"/>
         <prop actor="props/structures/carthaginians/tophet_palms.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
       </props>
@@ -29,6 +33,8 @@
         <prop actor="particle/destruction_dust_med_gray.xml" attachpoint="root"/>
         <prop actor="props/structures/carthaginians/tophet_palms.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
+        <prop actor="" attachpoint="fire1"/>
+        <prop actor="" attachpoint="fire2"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/meshes/structural/kart_tophet.dae b/binaries/data/mods/public/art/meshes/structural/kart_tophet.dae
index 6e41ffd86a..2d195c0177 100644
--- a/binaries/data/mods/public/art/meshes/structural/kart_tophet.dae
+++ b/binaries/data/mods/public/art/meshes/structural/kart_tophet.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:00e2f428caf38d5c79deb04d73719127c90952d8adb46b3f201da4479bd202b6
-size 132445
+oid sha256:29ff6757c65d44bfc995355b509f49f82d86e8ca280359698bb4e93d21334de4
+size 197591
diff --git a/binaries/data/mods/public/art/textures/particles/smoke_128b.png b/binaries/data/mods/public/art/textures/particles/smoke_128b.png
index 7f51895c0e..6adad79d6b 100644
--- a/binaries/data/mods/public/art/textures/particles/smoke_128b.png
+++ b/binaries/data/mods/public/art/textures/particles/smoke_128b.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e65a9d0ea73d484439924cbacc2dc09f7170515485dae2be8576a59b278580b
-size 8483
+oid sha256:9361be98fdd45b5c40e7d3f7166e653301300a4e1ca3933cebac2b2d52437ace
+size 7165
diff --git a/binaries/data/mods/public/maps/scenarios/Sandbox - Athenians.pmp b/binaries/data/mods/public/maps/scenarios/Sandbox - Athenians.pmp
index f81e3a3ac2..4990a68e1f 100644
--- a/binaries/data/mods/public/maps/scenarios/Sandbox - Athenians.pmp	
+++ b/binaries/data/mods/public/maps/scenarios/Sandbox - Athenians.pmp	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:82c9024d406af79b42ca00f398ad9862bd58746c6b5415cd80625dfd32f458d4
-size 2623817
+oid sha256:d995637881c05b50745a690d0840e3b9c910ed70e59ccfb771848939da90975c
+size 2623835
diff --git a/binaries/data/mods/public/maps/scenarios/Sandbox - Athenians.xml b/binaries/data/mods/public/maps/scenarios/Sandbox - Athenians.xml
index c524b5127b..c9792c77a1 100644
--- a/binaries/data/mods/public/maps/scenarios/Sandbox - Athenians.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Sandbox - Athenians.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:06266151a27982036ae150b0c27b7c5aecb999b5dc453fc3ea55bf8a3f9272aa
-size 137956
+oid sha256:02f4b346aef827c4043c56a9a20266f2e61d262bd16c20fa380c5caf4bbc3124
+size 138595
diff --git a/binaries/data/mods/public/simulation/components/BuildRestrictions.js b/binaries/data/mods/public/simulation/components/BuildRestrictions.js
index e94e5366be..f87282a3fb 100644
--- a/binaries/data/mods/public/simulation/components/BuildRestrictions.js
+++ b/binaries/data/mods/public/simulation/components/BuildRestrictions.js
@@ -51,6 +51,7 @@ BuildRestrictions.prototype.Schema =
 			"<value>Special</value>" +
 			"<value>Wonder</value>" +
 			"<value>Apadana</value>" +
+			"<value>Embassy</value>" +
 		"</choice>" +
 	"</element>" +
 	"<optional>" +
diff --git a/binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_celt_mercs.json b/binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_celt_mercs.json
index d25072b199..1672edf65b 100644
--- a/binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_celt_mercs.json
+++ b/binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_celt_mercs.json
@@ -1,12 +1,13 @@
 {
-	"genericName": "Gallic Mercenary Captain",
+	"pair": "carthaginians/pair_celt_mercs_1",
+	"genericName": "Celtic Mercenary Captain",
 	"description": "Celtic mercenaries have their metal cost decreased.",
-	"cost": {"food": 200, "wood": 0, "stone": 0, "metal": 200},
+	"cost": {"food": 100, "wood": 0, "stone": 0, "metal": 100},
 	"requirements": {"tech": "phase_town"},
 	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "helmet_corinthian_gold.png",
+	"icon": "helmet_corinthian_silver.png",
 	"researchTime": 30,
-	"tooltip": "Hire a Gallic mercenary captain to reduce metal cost -50% for Celtic mercenaries.",
-	"modifications": [{"value": "Cost/Resources/metal", "multiplier": 0.5}],
+	"tooltip": "Hire a Celtic mercenary captain to reduce metal cost -25% for Celtic mercenaries.",
+	"modifications": [{"value": "Cost/Resources/metal", "multiplier": 0.75}],
 	"affects": ["Celt Mercenary"]
 }
\ No newline at end of file
diff --git a/binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_celt_mercs_2.json b/binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_celt_mercs_2.json
new file mode 100644
index 0000000000..a600698d46
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_celt_mercs_2.json
@@ -0,0 +1,13 @@
+{
+	"pair": "carthaginians/pair_celt_mercs_2",
+	"genericName": "Gallic Mercenary General",
+	"description": "Celtic mercenaries have their metal cost decreased.",
+	"cost": {"food": 200, "wood": 0, "stone": 0, "metal": 200},
+	"requirements": {"tech": "phase_city"},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "helmet_corinthian_gold.png",
+	"researchTime": 30,
+	"tooltip": "Hire a Gallic mercenary general to reduce metal cost -25% for Celtic mercenaries.",
+	"modifications": [{"value": "Cost/Resources/metal", "multiplier": 0.75}],
+	"affects": ["Celt Mercenary"]
+}
\ No newline at end of file
diff --git a/binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_iberian_mercs.json b/binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_iberian_mercs.json
index b9468c54c0..11b044c82c 100644
--- a/binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_iberian_mercs.json
+++ b/binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_iberian_mercs.json
@@ -1,12 +1,13 @@
 {
-	"genericName": "Iberian Mercenary Captain",
+	"pair": "carthaginians/pair_iberian_mercs_1",
+	"genericName": "Lusitanian Mercenary Captain",
 	"description": "Iberian mercenaries have their metal cost decreased.",
-	"cost": {"food": 200, "wood": 0, "stone": 0, "metal": 200},
+	"cost": {"food": 100, "wood": 0, "stone": 0, "metal": 100},
 	"requirements": {"tech": "phase_town"},
 	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "helmet_corinthian_gold.png",
+	"icon": "helmet_corinthian_silver.png",
 	"researchTime": 30,
-	"tooltip": "Hire an Iberian mercenary captain to reduce metal cost -50% for Iberian mercenaries.",
-	"modifications": [{"value": "Cost/Resources/metal", "multiplier": 0.5}],
+	"tooltip": "Hire a Lusitanian mercenary captain to reduce metal cost -25% for Iberian mercenaries.",
+	"modifications": [{"value": "Cost/Resources/metal", "multiplier": 0.75}],
 	"affects": ["Iberian Mercenary"]
 }
\ No newline at end of file
diff --git a/binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_iberian_mercs_2.json b/binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_iberian_mercs_2.json
new file mode 100644
index 0000000000..9949df2f5e
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_iberian_mercs_2.json
@@ -0,0 +1,13 @@
+{
+	"pair": "carthaginians/pair_iberian_mercs_2",
+	"genericName": "Celtiberian Mercenary General",
+	"description": "Iberian mercenaries have their metal cost decreased.",
+	"cost": {"food": 200, "wood": 0, "stone": 0, "metal": 200},
+	"requirements": {"tech": "phase_city"},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "helmet_corinthian_gold.png",
+	"researchTime": 30,
+	"tooltip": "Hire a Celtiberian mercenary general to reduce metal cost -25% for Iberian mercenaries.",
+	"modifications": [{"value": "Cost/Resources/metal", "multiplier": 0.75}],
+	"affects": ["Iberian Mercenary"]
+}
\ No newline at end of file
diff --git a/binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_italian_mercs.json b/binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_italian_mercs.json
index c9bd9e4c72..cdb85813ce 100644
--- a/binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_italian_mercs.json
+++ b/binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_italian_mercs.json
@@ -1,12 +1,13 @@
 {
+	"pair": "carthaginians/pair_italian_mercs_1",
 	"genericName": "Italiote Mercenary Captain",
 	"description": "Italian mercenaries have their metal cost decreased.",
-	"cost": {"food": 200, "wood": 0, "stone": 0, "metal": 200},
+	"cost": {"food": 100, "wood": 0, "stone": 0, "metal": 100},
 	"requirements": {"tech": "phase_town"},
 	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "helmet_corinthian_gold.png",
+	"icon": "helmet_corinthian_silver.png",
 	"researchTime": 30,
-	"tooltip": "Hire an Italiote mercenary captain to reduce metal cost -50% for Italian mercenaries.",
-	"modifications": [{"value": "Cost/Resources/metal", "multiplier": 0.5}],
+	"tooltip": "Hire an Italiote mercenary captain to reduce metal cost -25% for Italian mercenaries.",
+	"modifications": [{"value": "Cost/Resources/metal", "multiplier": 0.75}],
 	"affects": ["Italian Mercenary"]
 }
\ No newline at end of file
diff --git a/binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_italian_mercs_2.json b/binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_italian_mercs_2.json
new file mode 100644
index 0000000000..fc7d5c9f85
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_italian_mercs_2.json
@@ -0,0 +1,13 @@
+{
+	"pair": "carthaginians/pair_italian_mercs_2",
+	"genericName": "Italiote Mercenary General",
+	"description": "Italian mercenaries have their metal cost decreased.",
+	"cost": {"food": 200, "wood": 0, "stone": 0, "metal": 200},
+	"requirements": {"tech": "phase_city"},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "helmet_corinthian_gold.png",
+	"researchTime": 30,
+	"tooltip": "Hire an Italiote mercenary general to reduce metal cost -25% for Italian mercenaries.",
+	"modifications": [{"value": "Cost/Resources/metal", "multiplier": 0.75}],
+	"affects": ["Italian Mercenary"]
+}
\ No newline at end of file
diff --git a/binaries/data/mods/public/simulation/data/technologies/carthaginians/pair_celt_mercs_1.json b/binaries/data/mods/public/simulation/data/technologies/carthaginians/pair_celt_mercs_1.json
new file mode 100644
index 0000000000..a81e33fe86
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/technologies/carthaginians/pair_celt_mercs_1.json
@@ -0,0 +1,5 @@
+{
+	"genericName": "Celtic merc cost vs. recruit time #1",
+	"top": "carthaginians/cost_celt_mercs",
+	"bottom": "carthaginians/traintime_celt_mercs"
+}
diff --git a/binaries/data/mods/public/simulation/data/technologies/carthaginians/pair_celt_mercs_2.json b/binaries/data/mods/public/simulation/data/technologies/carthaginians/pair_celt_mercs_2.json
new file mode 100644
index 0000000000..5c77119ed1
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/technologies/carthaginians/pair_celt_mercs_2.json
@@ -0,0 +1,6 @@
+{
+	"genericName": "Celtic merc cost vs. recruit time #2",
+	"top": "carthaginians/cost_celt_mercs_2",
+	"bottom": "carthaginians/traintime_celt_mercs_2",
+    "supersedes": "carthaginians/pair_celt_mercs_1"
+}
diff --git a/binaries/data/mods/public/simulation/data/technologies/carthaginians/pair_iberian_mercs_1.json b/binaries/data/mods/public/simulation/data/technologies/carthaginians/pair_iberian_mercs_1.json
new file mode 100644
index 0000000000..dae2ef617a
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/technologies/carthaginians/pair_iberian_mercs_1.json
@@ -0,0 +1,5 @@
+{
+	"genericName": "Iberian merc cost vs. recruit time #1",
+	"top": "carthaginians/cost_iberian_mercs",
+	"bottom": "carthaginians/traintime_iberian_mercs"
+}
diff --git a/binaries/data/mods/public/simulation/data/technologies/carthaginians/pair_iberian_mercs_2.json b/binaries/data/mods/public/simulation/data/technologies/carthaginians/pair_iberian_mercs_2.json
new file mode 100644
index 0000000000..71970a75d2
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/technologies/carthaginians/pair_iberian_mercs_2.json
@@ -0,0 +1,6 @@
+{
+	"genericName": "Iberian merc cost vs. recruit time #2",
+	"top": "carthaginians/cost_iberian_mercs_2",
+	"bottom": "carthaginians/traintime_iberian_mercs_2",
+    "supersedes": "carthaginians/pair_iberian_mercs_1"
+}
diff --git a/binaries/data/mods/public/simulation/data/technologies/carthaginians/pair_italian_mercs_1.json b/binaries/data/mods/public/simulation/data/technologies/carthaginians/pair_italian_mercs_1.json
new file mode 100644
index 0000000000..61ab35d8eb
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/technologies/carthaginians/pair_italian_mercs_1.json
@@ -0,0 +1,5 @@
+{
+	"genericName": "Italian merc cost vs. recruit time #1",
+	"top": "carthaginians/cost_italian_mercs",
+	"bottom": "carthaginians/traintime_italian_mercs"
+}
diff --git a/binaries/data/mods/public/simulation/data/technologies/carthaginians/pair_italian_mercs_2.json b/binaries/data/mods/public/simulation/data/technologies/carthaginians/pair_italian_mercs_2.json
new file mode 100644
index 0000000000..4312b3431c
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/technologies/carthaginians/pair_italian_mercs_2.json
@@ -0,0 +1,6 @@
+{
+	"genericName": "Italian merc cost vs. recruit time #2",
+	"top": "carthaginians/cost_italian_mercs_2",
+	"bottom": "carthaginians/traintime_italian_mercs_2",
+    "supersedes": "carthaginians/pair_italian_mercs_1"
+}
diff --git a/binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_celt_mercs.json b/binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_celt_mercs.json
new file mode 100644
index 0000000000..421b9c1ad9
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_celt_mercs.json
@@ -0,0 +1,13 @@
+{
+	"pair": "carthaginians/pair_celt_mercs_1",
+	"genericName": "Celtic Alliance",
+	"description": "Celtic mercenaries have their train time decreased.",
+	"cost": {"food": 0, "wood": 100, "stone": 0, "metal": 100},
+	"requirements": {"tech": "phase_town"},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "clenched_fist.png",
+	"researchTime": 30,
+	"tooltip": "Ally with Celtic towns to reduce recruit time -20% for Celtic mercenaries.",
+	"modifications": [{"value": "Cost/BuildTime", "multiplier": 0.8}],
+	"affects": ["Celt Mercenary"]
+}
\ No newline at end of file
diff --git a/binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_celt_mercs_2.json b/binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_celt_mercs_2.json
new file mode 100644
index 0000000000..02393d6971
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_celt_mercs_2.json
@@ -0,0 +1,13 @@
+{
+	"pair": "carthaginians/pair_celt_mercs_2",
+	"genericName": "Gallic Hegemony",
+	"description": "Celtic mercenaries have their train time decreased.",
+	"cost": {"food": 0, "wood": 0, "stone": 200, "metal": 200},
+	"requirements": {"tech": "phase_city"},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "fist_spear.png",
+	"researchTime": 30,
+	"tooltip": "Subjugate Gallic tribes to reduce recruit time -20% for Celtic mercenaries.",
+	"modifications": [{"value": "Cost/BuildTime", "multiplier": 0.8}],
+	"affects": ["Celt Mercenary"]
+}
\ No newline at end of file
diff --git a/binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_iberian_mercs.json b/binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_iberian_mercs.json
new file mode 100644
index 0000000000..27819e86c0
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_iberian_mercs.json
@@ -0,0 +1,13 @@
+{
+	"pair": "carthaginians/pair_iberian_mercs_1",
+	"genericName": "Iberian Alliance",
+	"description": "Iberian mercenaries have their train time decreased.",
+	"cost": {"food": 0, "wood": 100, "stone": 0, "metal": 100},
+	"requirements": {"tech": "phase_town"},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "clenched_fist.png",
+	"researchTime": 30,
+	"tooltip": "Ally with Iberian towns to reduce recruit time -20% for Iberian mercenaries.",
+	"modifications": [{"value": "Cost/BuildTime", "multiplier": 0.8}],
+	"affects": ["Iberian Mercenary"]
+}
\ No newline at end of file
diff --git a/binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_iberian_mercs_2.json b/binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_iberian_mercs_2.json
new file mode 100644
index 0000000000..a7371c73de
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_iberian_mercs_2.json
@@ -0,0 +1,13 @@
+{
+	"pair": "carthaginians/pair_celt_mercs_2",
+	"genericName": "Spanish Hegemony",
+	"description": "Iberian mercenaries have their train time decreased.",
+	"cost": {"food": 0, "wood": 0, "stone": 200, "metal": 200},
+	"requirements": {"tech": "phase_city"},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "fist_spear.png",
+	"researchTime": 30,
+	"tooltip": "Subjugate Spain to reduce recruit time -20% for Iberian mercenaries.",
+	"modifications": [{"value": "Cost/BuildTime", "multiplier": 0.8}],
+	"affects": ["Iberian Mercenary"]
+}
\ No newline at end of file
diff --git a/binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_italian_mercs.json b/binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_italian_mercs.json
new file mode 100644
index 0000000000..08f59ef854
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_italian_mercs.json
@@ -0,0 +1,13 @@
+{
+	"pair": "carthaginians/pair_italian_mercs_1",
+	"genericName": "Italiote Alliance",
+	"description": "Italian mercenaries have their train time decreased.",
+	"cost": {"food": 0, "wood": 100, "stone": 0, "metal": 100},
+	"requirements": {"tech": "phase_town"},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "clenched_fist.png",
+	"researchTime": 30,
+	"tooltip": "Ally with Italiote towns to reduce recruit time -20% for Italian mercenaries.",
+	"modifications": [{"value": "Cost/BuildTime", "multiplier": 0.8}],
+	"affects": ["Italian Mercenary"]
+}
\ No newline at end of file
diff --git a/binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_italian_mercs_2.json b/binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_italian_mercs_2.json
new file mode 100644
index 0000000000..2f66c74043
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_italian_mercs_2.json
@@ -0,0 +1,13 @@
+{
+	"pair": "carthaginians/pair_italian_mercs_2",
+	"genericName": "Italiote Hegemony",
+	"description": "Italian mercenaries have their train time decreased.",
+	"cost": {"food": 0, "wood": 0, "stone": 200, "metal": 200},
+	"requirements": {"tech": "phase_city"},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "fist_spear.png",
+	"researchTime": 30,
+	"tooltip": "Subjugate Italiote towns to reduce recruit time -20% for Italian mercenaries.",
+	"modifications": [{"value": "Cost/BuildTime", "multiplier": 0.8}],
+	"affects": ["Italian Mercenary"]
+}
\ No newline at end of file
diff --git a/binaries/data/mods/public/simulation/templates/special/player.xml b/binaries/data/mods/public/simulation/templates/special/player.xml
index 24522dcc7f..829a59bed8 100644
--- a/binaries/data/mods/public/simulation/templates/special/player.xml
+++ b/binaries/data/mods/public/simulation/templates/special/player.xml
@@ -9,6 +9,7 @@
       <Wonder>1</Wonder>
       <Hero>1</Hero>
       <Apadana>1</Apadana>
+      <Embassy>1</Embassy>
     </Limits>
   </EntityLimits>
   <Player/>
diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml b/binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml
index 2b07fd6835..bbe6961fb1 100644
--- a/binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml
@@ -31,7 +31,8 @@
       units/cart_cavalry_swordsman_2_b
     </Entities>
     <Technologies datatype="tokens">
-      carthaginians/cost_celt_mercs
+      carthaginians/pair_celt_mercs_1
+      carthaginians/pair_celt_mercs_2
     </Technologies>
   </ProductionQueue>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml b/binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml
index 3242c757d2..8856cc54ec 100644
--- a/binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml
@@ -25,7 +25,8 @@
       units/cart_cavalry_swordsman_b
     </Entities>
     <Technologies datatype="tokens">
-      carthaginians/cost_iberian_mercs
+      carthaginians/pair_iberian_mercs_1
+      carthaginians/pair_iberian_mercs_2
     </Technologies>
   </ProductionQueue>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml b/binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml
index d874f283b2..653e34b891 100644
--- a/binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml
@@ -31,7 +31,8 @@
       units/cart_cavalry_spearman_b
     </Entities>
     <Technologies datatype="tokens">
-      carthaginians/cost_italian_mercs
+      carthaginians/pair_italian_mercs_1
+      carthaginians/pair_italian_mercs_2
     </Technologies>
   </ProductionQueue>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic.xml
index 7524712058..4e7f3d97f5 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_civic.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_civic.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_structure">
   <Armour>
     <Hack>5</Hack>
-    <Pierce>20</Pierce>
+    <Pierce>25</Pierce>
     <Crush>5</Crush>
     <Foundation>
       <Hack>3</Hack>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_outpost.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_outpost.xml
index 8130bc169c..44f994a22e 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defense_outpost.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_outpost.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_structure_defense">
   <Armour>
     <Hack>5</Hack>
-    <Pierce>10</Pierce>
+    <Pierce>20</Pierce>
     <Crush>1</Crush>
     <Foundation>
       <Hack>3</Hack>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military.xml b/binaries/data/mods/public/simulation/templates/template_structure_military.xml
index 0c252386a2..bafc46da7b 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_military.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_military.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_structure">
   <Armour>
     <Hack>10</Hack>
-    <Pierce>25</Pierce>
+    <Pierce>30</Pierce>
     <Crush>5</Crush>
     <Foundation>
       <Hack>5</Hack>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
index bac8a3563a..68f9a2a50e 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
+  <BuildRestrictions>
+    <Category>Embassy</Category>
+  </BuildRestrictions>
   <Cost>
     <PopulationBonus>0</PopulationBonus>
     <Resources>
@@ -38,6 +41,13 @@
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
   </ProductionQueue>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_gymnasium.xml</select>
+      <constructed>interface/complete/building/complete_gymnasium.xml</constructed>
+      <death>attack/destruction/building_collapse_large.xml</death>
+    </SoundGroups>
+  </Sound>
   <TerritoryInfluence>
     <Radius>25</Radius>
   </TerritoryInfluence>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_special.xml b/binaries/data/mods/public/simulation/templates/template_structure_special.xml
index 0d30290f62..152844e12b 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_special.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_special.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_structure">
   <Armour>
     <Hack>5</Hack>
-    <Pierce>20</Pierce>
+    <Pierce>25</Pierce>
     <Crush>5</Crush>
     <Foundation>
       <Hack>3</Hack>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml b/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
index 417ae79e1a..3b6ca8aca9 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>3</Hack>
-    <Pierce>20</Pierce>
-    <Crush>3</Crush>
+    <Hack>5</Hack>
+    <Pierce>25</Pierce>
+    <Crush>5</Crush>
     <Foundation>
       <Hack>2</Hack>
       <Pierce>10</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
index cff321a490..f5995d379f 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
@@ -32,6 +32,15 @@
 Good sieging capability. "Stench" Aura vs. Horses. Can run amok. Countered by Swordsmen and Skirmishers.</Tooltip>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <AlwaysVisible/>
+      <Texture>
+        <MainTexture>star/256x256.png</MainTexture>
+        <MainTextureMask>star/256x256_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <TrainingRestrictions>
     <Category>Hero</Category>
   </TrainingRestrictions>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml b/binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml
index c31aeb1ba7..00132ab53c 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml
@@ -30,7 +30,7 @@
 	<GenericName>Acharya Chanakya</GenericName>
     <SpecificName>Acharya Chanakya</SpecificName>
     <Icon>units/maur_hero_chanakya.png</Icon>
-	<Tooltip>Hero Archer.
+	<Tooltip>Hero Healer.
 Hero Special: "Teacher." TBD.</Tooltip>
     <History>TBD.</History>
     <RequiredTechnology>phase_city</RequiredTechnology>