Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/teambonuses/athen_player_teambonus.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/teambonuses/athen_player_teambonus.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/teambonuses/athen_player_teambonus.json
@@ -10,5 +10,5 @@
 		{ "value": "Researcher/TechCostMultiplier/time", "multiply": 0.5 }
 	],
 	"auraName": "Democracy",
-	"auraDescription": "Civic center technologies −50% research time and −30% cost."
+	"auraDescription": "Civic Center technologies −50% research time and −30% cost."
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/iphicratean_reforms.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/iphicratean_reforms.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/iphicratean_reforms.json
@@ -14,6 +14,6 @@
 	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "helmet_corinthian_crest.png",
 	"researchTime": 30,
-	"tooltip": "Athenian Gymnasia, Docks and Triremes can train Marines.",
+	"tooltip": "Athenian Docks and Triremes can train Marines and Cretan Mercenary Archers.",
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/dock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/dock.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/dock.xml
@@ -22,7 +22,8 @@
   <Trainer>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/{civ}/champion_marine
+      units/{civ}/champion_marine_dock
+      units/{civ}/infantry_archer_b_dock
     </Entities>
   </Trainer>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/champion_marine.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/champion_marine.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/champion_marine.xml
@@ -1,14 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="civ/athen|template_unit_champion_infantry_swordsman">
+  <Cost>
+    <Resources>
+      <food op="add">-20</food>
+      <wood op="add">-20</wood>
+      <metal op="add">-20</metal>
+    </Resources>
+  </Cost>
   <Identity>
     <GenericName>Athenian Marine</GenericName>
     <SpecificName>Epibátēs Athēnaîos</SpecificName>
     <Icon>units/athen/champion_marine.png</Icon>
     <Requirements>
-      <Techs datatype="tokens">-phase_city iphicratean_reforms</Techs>
+      <Techs datatype="tokens">-phase_city phase_town</Techs>
     </Requirements>
   </Identity>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack op="add">-3</Hack>
+        <Pierce op="add">-1</Pierce>
+      </Damage>
+    </Entity>
+  </Resistance>
+  <Loot>
+    <food op="add">-2</food>
+    <wood op="add">-2</wood>
+    <metal op="add">-2</metal>
+  </Loot>
   <VisualActor>
     <Actor>units/athenians/infantry_swordsman_c.xml</Actor>
   </VisualActor>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.2</WalkSpeed>
+    <Acceleration op="mul">1.2</Acceleration>
+  </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/champion_marine_dock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/champion_marine_dock.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/champion_marine_dock.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/athen/champion_marine">
+  <Identity>
+    <Requirements>
+      <Techs datatype="tokens">-phase_town iphicratean_reforms</Techs>
+    </Requirements>
+  </Identity>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_archer_a_dock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_archer_a_dock.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_archer_a_dock.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/athen/infantry_archer_b_dock">
+  <Identity>
+    <Rank>Advanced</Rank>
+  </Identity>
+  <Promotion>
+    <Entity>units/athen/infantry_archer_e</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/athenians/infantry_archer_a.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_archer_b_dock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_archer_b_dock.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_archer_b_dock.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/athen/infantry_archer_b">
+  <Identity>
+    <Requirements>
+      <Techs datatype="tokens">-phase_town iphicratean_reforms</Techs>
+    </Requirements>
+  </Identity>
+  <Promotion>
+    <Entity>units/athen/infantry_archer_a_dock</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/athenians/infantry_archer_b.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_trireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_trireme.xml
@@ -13,7 +13,8 @@
   <Trainer>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/{civ}/champion_marine
+      units/{civ}/champion_marine_dock
+      units/{civ}/infantry_archer_b_dock
     </Entities>
   </Trainer>
   <Researcher>