diff --git a/binaries/data/mods/public/simulation/templates/other/macedonian_argyraspidai.xml b/binaries/data/mods/public/simulation/templates/other/macedonian_argyraspidai.xml
index 65129077df..f81d866b82 100644
--- a/binaries/data/mods/public/simulation/templates/other/macedonian_argyraspidai.xml
+++ b/binaries/data/mods/public/simulation/templates/other/macedonian_argyraspidai.xml
@@ -10,9 +10,9 @@
     <Max>145</Max>
   </Health>
   <Armour>
-    <Hack>15.0</Hack>
-    <Pierce>20.0</Pierce>
-    <Crush>20.0</Crush>
+    <Hack>10.0</Hack>
+    <Pierce>12.0</Pierce>
+    <Crush>10.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>5.0</WalkSpeed>
@@ -22,12 +22,15 @@
   </UnitMotion>
   <Attack>
     <Melee>
-      <Hack>16.0</Hack>
-      <Pierce>22.0</Pierce>
+      <Hack>11.0</Hack>
+      <Pierce>21.0</Pierce>
+      <MaxRange>6.0</MaxRange>
     </Melee>
     <Charge>
-      <Hack>40.0</Hack>
-      <Pierce>48.0</Pierce>
+      <Hack>22.0</Hack>
+      <Pierce>42.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>6.0</MaxRange>
     </Charge>
   </Attack>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/other/macedonian_hypaspist.xml b/binaries/data/mods/public/simulation/templates/other/macedonian_hypaspist.xml
index d66b3544e6..342767f9a2 100644
--- a/binaries/data/mods/public/simulation/templates/other/macedonian_hypaspist.xml
+++ b/binaries/data/mods/public/simulation/templates/other/macedonian_hypaspist.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_super_infantry">
+<Entity parent="template_unit_super_infantry_spearman">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Hypaspist (Shield Bearer)</SpecificName>
@@ -14,36 +14,34 @@
   </Promotion>
   <Cost>
     <Resources>
-      <wood>75</wood>
-      <metal>50</metal>
+      <metal>20</metal>
     </Resources>
   </Cost>
   <Health>
     <Max>135</Max>
   </Health>
   <Armour>
-    <Hack>10.0</Hack>
-    <Pierce>15.0</Pierce>
-    <Crush>15.0</Crush>
+    <Hack>9.0</Hack>
+    <Pierce>12.0</Pierce>
+    <Crush>9.0</Crush>
   </Armour>
   <UnitMotion>
     <WalkSpeed>5.5</WalkSpeed>
     <Run>
-      <Speed>15.0</Speed>
+      <Speed>16.5</Speed>
     </Run>
   </UnitMotion>
   <Attack>
     <Melee>
-      <Hack>14.0</Hack>
+      <Hack>10.0</Hack>
       <Pierce>20.0</Pierce>
-      <Crush>0.0</Crush>
-      <RepeatTime>1500</RepeatTime>
+      <MaxRange>6.0</MaxRange>
     </Melee>
     <Charge>
-      <Hack>36.0</Hack>
+      <Hack>20.0</Hack>
       <Pierce>40.0</Pierce>
       <Crush>0.0</Crush>
-      <MaxRange>3.0</MaxRange>
+      <MaxRange>6.0</MaxRange>
     </Charge>
   </Attack>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/other/sparta_hellenistic_phalangitai.xml b/binaries/data/mods/public/simulation/templates/other/sparta_hellenistic_phalangitai.xml
index e83c043710..14d15d3f0f 100644
--- a/binaries/data/mods/public/simulation/templates/other/sparta_hellenistic_phalangitai.xml
+++ b/binaries/data/mods/public/simulation/templates/other/sparta_hellenistic_phalangitai.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_super_infantry">
+<Entity parent="template_unit_super_infantry_pikeman">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Spartan Phalangite</SpecificName>
@@ -8,42 +8,7 @@
     <Tooltip>Bonused vs. Cavalry and Infantry. Weak vs. Ranged Units. Uses the Syntagma Formation.</Tooltip>
     <History>The 3rd Century BC saw the brief rise of a resurgent Sparta. Eager to regain past glory, the Spartan kings Agis and Cleomenes briefly resurrected the ancient Spartan laws and nearly reconquered the Peloponnese. If not for the intervention of the Macedonians in both insurrections Sparta would have reigned victorious. This soldier here is a Spartan armed in the 'Macedonian fashion' with a small round pelta shield and the line pike, or "Sarissa" for use in the Syntagma phalanx formation.</History>
   </Identity>
-  <Cost>
-    <BuildTime>27</BuildTime>
-    <Resources>
-      <wood>63</wood>
-      <metal>30</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>140</Max>
-  </Health>
-  <Stamina>
-    <Max>580</Max>
-  </Stamina>
-  <Armour>
-    <Hack>12.0</Hack>
-    <Pierce>10.0</Pierce>
-    <Crush>16.0</Crush>
-  </Armour>
-  <UnitMotion>
-    <WalkSpeed>5.2</WalkSpeed>
-    <Run>
-      <Speed>13.0</Speed>
-    </Run>
-  </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>10.0</Hack>
-      <Pierce>35.0</Pierce>
-      <MaxRange>7.0</MaxRange>
-    </Melee>
-    <Charge>
-      <Hack>30.5</Hack>
-      <Pierce>50.0</Pierce>
-      <MaxRange>7.0</MaxRange>
-    </Charge>
-  </Attack>
+
   <VisualActor>
     <Actor>units/hellenes/spartan_pikeman.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_super_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_super_infantry.xml
index 2bfaf83ad0..c9e506ea5d 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_super_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_super_infantry.xml
@@ -11,7 +11,7 @@
       <food>50</food>
       <wood>0</wood>
       <stone>0</stone>
-      <metal>80</metal>
+      <metal>0</metal>
     </Resources>
   </Cost>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_super_infantry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_super_infantry_javelinist.xml
new file mode 100644
index 0000000000..22ad9029d9
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/template_unit_super_infantry_javelinist.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_super_infantry">
+  <Identity>
+    <GenericName>Super Ranged</GenericName>
+    <Classes datatype="tokens">Organic Foot</Classes>
+  </Identity>
+  <Cost>
+    <BuildTime>12</BuildTime>
+    <Resources>
+      <food>50</food>
+      <wood>80</wood>
+      <stone>0</stone>
+      <metal>0</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>120</Max>
+  </Health>
+  <Armour>
+    <Hack>6.0</Hack>
+    <Pierce>6.0</Pierce>
+    <Crush>5.0</Crush>
+  </Armour>
+  <UnitMotion>
+    <WalkSpeed>7.0</WalkSpeed>
+    <Run>
+      <Speed>17.5</Speed>
+    </Run>
+  </UnitMotion>
+  <Attack>
+    <Ranged>
+      <Hack>0.0</Hack>
+      <Pierce>38.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>52</MaxRange>
+      <MinRange>12.0</MinRange>
+      <ProjectileSpeed>25.0</ProjectileSpeed>
+      <PrepareTime>1200</PrepareTime>
+      <RepeatTime>2000</RepeatTime>
+    </Ranged>
+  </Attack>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_super_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_super_infantry_pikeman.xml
new file mode 100644
index 0000000000..c096015fb0
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/template_unit_super_infantry_pikeman.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_super_infantry">
+  <Identity>
+    <GenericName>Super Infantry Pikeman</GenericName>
+    <IconCell>43</IconCell>
+    <Classes datatype="tokens">Organic Foot</Classes>
+  </Identity>
+  <Cost>
+    <BuildTime>13</BuildTime>
+    <Resources>
+      <food>50</food>
+      <wood>50</wood>
+      <stone>0</stone>
+      <metal>50</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>130</Max>
+  </Health>
+  <Stamina>
+    <Max>1200</Max>
+  </Stamina>
+  <Armour>
+    <Hack>10.0</Hack>
+    <Pierce>9.0</Pierce>
+    <Crush>9.0</Crush>
+  </Armour>
+  <UnitMotion>
+    <WalkSpeed>4.0</WalkSpeed>
+    <Run>
+      <Speed>12.0</Speed>
+      <Range>600.0</Range>
+      <RangeMin>5.0</RangeMin>
+    </Run>
+  </UnitMotion>
+  <Attack>
+    <Melee>
+      <Hack>10.0</Hack>
+      <Pierce>25.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>8.0</MaxRange>
+      <RepeatTime>1000</RepeatTime>
+    </Melee>
+    <Charge>
+      <Hack>15.0</Hack>
+      <Pierce>38.0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>7.0</MaxRange>
+      <MinRange>0.0</MinRange>
+    </Charge>
+  </Attack>
+  <Sound>
+    <SoundGroups>
+      <select>voice/hellenes/civ/civ_male_select.xml</select>
+      <order_walk>voice/hellenes/civ/civ_male_ack.xml</order_walk>
+      <order_attack>voice/hellenes/civ/civ_male_attack.xml</order_attack>
+      <order_gather>voice/hellenes/civ/civ_male_ack.xml</order_gather>
+      <order_repair>voice/hellenes/civ/civ_male_ack.xml</order_repair>
+      <walk>actor/human/movement/walk.xml</walk>
+      <run>actor/human/movement/walk.xml</run>
+      <attack>attack/weapon/sword.xml</attack>
+      <death>actor/human/death/death.xml</death>
+    </SoundGroups>
+  </Sound>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_super_infantry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_super_infantry_spearman.xml
index 51e6a2bbef..f3cd23d76e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_super_infantry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_super_infantry_spearman.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_super">
+<Entity parent="template_unit_super_infantry">
   <Identity>
     <GenericName>Super Infantry Spearman</GenericName>
     <IconCell>43</IconCell>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_super_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_super_infantry_swordsman.xml
index 6d9e817d28..12ab2a4208 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_super_infantry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_super_infantry_swordsman.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_super">
+<Entity parent="template_unit_super_infantry">
   <Identity>
-    <GenericName>Super Infantry</GenericName>
+    <GenericName>Super Infantry Swordsman</GenericName>
     <IconCell>43</IconCell>
     <Classes datatype="tokens">Organic Foot</Classes>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_mace.xml b/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_mace.xml
index 09f654b0c2..90921bfa51 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_mace.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_mace.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_super_infantry">
+<Entity parent="template_unit_super_infantry_pikeman">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Pezhetairoi</SpecificName>
@@ -8,46 +8,11 @@
     <Tooltip>Bonused vs. Cavalry and Infantry. Weak vs. Ranged Units. Uses the Syntagma Formation.</Tooltip>
     <History>'Foot Companions', these were the elite troops from the Macedonian phalanx, whom carried their Sarissas with both hands, the white shields being attached to their armour. The Sarissa and the new tactics they used were developed by Philip II under Theban influence. If properly protected by cavalry on both sides, the Pezhetairoi were virtually invincible to any kind of enemy unit. They were always deployed in deep formations of 16+.</History>
   </Identity>
-  <Cost>
-    <BuildTime>28</BuildTime>
-    <Resources>
-      <wood>63</wood>
-      <metal>30</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>145</Max>
-  </Health>
-  <Stamina>
-    <Max>580</Max>
-  </Stamina>
-  <Armour>
-    <Hack>12.0</Hack>
-    <Pierce>10.0</Pierce>
-    <Crush>16.0</Crush>
-  </Armour>
-  <UnitMotion>
-    <WalkSpeed>5.2</WalkSpeed>
-    <Run>
-      <Speed>13.0</Speed>
-    </Run>
-  </UnitMotion>
-  <Attack>
-    <Melee>
-      <Hack>10.0</Hack>
-      <Pierce>35.0</Pierce>
-      <MaxRange>7.0</MaxRange>
-    </Melee>
-    <Charge>
-      <Hack>30.5</Hack>
-      <Pierce>50.0</Pierce>
-      <MaxRange>7.0</MaxRange>
-    </Charge>
-  </Attack>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
   <VisualActor>
     <Actor>units/hellenes/super_unit_3.xml</Actor>
   </VisualActor>
-  <Vision>
-    <Range>40</Range>
-  </Vision>
+
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_super_ranged_polis.xml b/binaries/data/mods/public/simulation/templates/units/hele_super_ranged_polis.xml
index 8816f4a44b..e065cacf03 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_super_ranged_polis.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_super_ranged_polis.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_super_ranged">
+<Entity parent="template_unit_super_infantry_javelinist">
   <Identity>
     <Civ>hele</Civ>
     <SpecificName>Ekdromos Athenaikos</SpecificName>
@@ -8,43 +8,29 @@
     <Tooltip>Bonused vs. Support Units and Ranged Units. Weak vs. Melee Units. Fast Move Speed.</Tooltip>
     <History>Ekdromos (literally: out runner) was a development of the Hoplite. Development of the Hoplite took many twists and turns based on the changing dynamics on the field of battle. Once armies began using Peltasts imported from Thrace something had to be done to counter this barrage of javelins thrown into the midst of a phalanx. The Thebans began to increase the armor of their hoplites, but the Athenians took a completely different approach and lightened the load for their infantry. The Ekdromoi would dash out from the phalanx, close with the enemy ranged units at speed, and cut them down at will. This approach also worked to harass more heavily armed troops as well, the enemy carrying too much weight to catch the vexatious Ekdromoi.</History>
   </Identity>
-  <Cost>
-    <BuildTime>26</BuildTime>
-    <Resources>
-      <wood>55</wood>
-      <metal>35</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>130</Max>
-  </Health>
-  <Stamina>
-    <Max>675</Max>
-  </Stamina>
   <Armour>
-    <Hack>7.0</Hack>
-    <Pierce>9.0</Pierce>
-    <Crush>14.0</Crush>
+    <Hack>5.0</Hack>
+    <Pierce>10.0</Pierce>
   </Armour>
   <UnitMotion>
-    <WalkSpeed>9.0</WalkSpeed>
+    <WalkSpeed>8.8</WalkSpeed>
     <Run>
-      <Speed>16.0</Speed>
+      <Speed>17.6</Speed>
     </Run>
   </UnitMotion>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
-      <Pierce>55.0</Pierce>
+      <Pierce>40.0</Pierce>
       <Crush>0.0</Crush>
-      <MaxRange>28.0</MaxRange>
+      <MaxRange>50</MaxRange>
       <MinRange>10.0</MinRange>
     </Ranged>
   </Attack>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
   <VisualActor>
     <Actor>units/hellenes/super_unit_2.xml</Actor>
   </VisualActor>
-  <Vision>
-    <Range>36</Range>
-  </Vision>
 </Entity>