diff --git a/binaries/data/mods/public/art/actors/props/units/shields/hele_round_b.xml b/binaries/data/mods/public/art/actors/props/units/shields/hele_round_b.xml
index 43f13a2b41..9742065149 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/hele_round_b.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/hele_round_b.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="1" name="base">
       <mesh>props/shield/round_h_f.pmd</mesh>
@@ -11,7 +9,6 @@
       </props>
     </variant>
   </group>
-
   <group>
     <variant frequency="1" name="shield-u">
       <texture>props/shield/hele_round_u.dds</texture>
@@ -32,7 +29,5 @@
       <texture>props/shield/hele_round_r.dds</texture>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/mace_round_argyraspides.xml b/binaries/data/mods/public/art/actors/props/units/shields/mace_round_argyraspides.xml
new file mode 100644
index 0000000000..d95418ee0a
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/shields/mace_round_argyraspides.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="base">
+      <mesh>props/shield/aspis_f.dae</mesh>
+      <props>
+        <prop actor="props/units/shields/mace_round_hypaspist_back.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="4" name="Argyraspis (A)">
+      <texture>props/shield/mace_silver_a.dds</texture>
+    </variant>
+    <variant frequency="3" name="Argyraspis (B)">
+      <texture>props/shield/mace_silver_b.dds</texture>
+    </variant>
+    <variant frequency="2" name="Argyraspis (C)">
+      <texture>props/shield/mace_silver_c.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/mace_round_hypaspist.xml b/binaries/data/mods/public/art/actors/props/units/shields/mace_round_hypaspist.xml
index d95418ee0a..ce78fc669b 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/mace_round_hypaspist.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/mace_round_hypaspist.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-  <castshadow/>
   <group>
     <variant frequency="1" name="base">
-      <mesh>props/shield/aspis_f.dae</mesh>
+      <mesh>props/shield/round_h_f.pmd</mesh>
       <props>
-        <prop actor="props/units/shields/mace_round_hypaspist_back.xml" attachpoint="root"/>
+        <prop actor="props/units/shields/hele_round_back.xml" attachpoint="back"/>
       </props>
     </variant>
   </group>
   <group>
-    <variant frequency="4" name="Argyraspis (A)">
-      <texture>props/shield/mace_silver_a.dds</texture>
+    <variant frequency="3" name="shield-b">
+      <texture>props/shield/hele_round_b.dds</texture>
     </variant>
-    <variant frequency="3" name="Argyraspis (B)">
-      <texture>props/shield/mace_silver_b.dds</texture>
+    <variant frequency="3" name="shield-q">
+      <texture>props/shield/hele_round_q.dds</texture>
     </variant>
-    <variant frequency="2" name="Argyraspis (C)">
-      <texture>props/shield/mace_silver_c.dds</texture>
+    <variant frequency="3" name="shield-v">
+      <texture>props/shield/hele_round_v.dds</texture>
+    </variant>
+    <variant frequency="2" name="shield-w">
+      <texture>props/shield/hele_round_w.dds</texture>
     </variant>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/temp/mace_su1_argyraspis.xml b/binaries/data/mods/public/art/actors/temp/mace_su1_argyraspis.xml
new file mode 100644
index 0000000000..71b92878c4
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/temp/mace_su1_argyraspis.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Base">
+      <animations>
+        <animation file="biped/inf_hoplite_idle_a.psa" name="Idle" speed="200"/>
+        <animation file="biped/inf_hoplite_walk.psa" name="Walk" speed="20"/>
+        <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="Melee" speed="200"/>
+        <animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="13"/>
+        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="300"/>
+      </animations>
+      <mesh>skeletal/m_tunic_short.dae</mesh>
+      <props>
+        <prop actor="props/units/shields/mace_round_argyraspides.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/mace_su1.xml" attachpoint="helmet"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="hypaspist-armour-thorax">
+      <texture>skeletal/mace_hypaspist_1.dds</texture>
+    </variant>
+    <variant frequency="1" name="hypaspist-armour-cuirass">
+      <texture>skeletal/mace_hypaspist_2.dds</texture>
+    </variant>
+    <variant frequency="1" name="hypaspist-armour-cuirass-2">
+      <texture>skeletal/mace_su1_hypaspist_1.dds</texture>
+    </variant>
+    <variant frequency="2" name="hypaspist-armour-cuirass-3">
+      <texture>skeletal/mace_su1_hypaspist_2.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/temp/mace_su1_hypaspist.xml b/binaries/data/mods/public/art/actors/temp/mace_su1_hypaspist.xml
index b79f5d7cf3..5f7e01700f 100644
--- a/binaries/data/mods/public/art/actors/temp/mace_su1_hypaspist.xml
+++ b/binaries/data/mods/public/art/actors/temp/mace_su1_hypaspist.xml
@@ -20,22 +20,19 @@
         <prop actor="props/units/shields/mace_round_hypaspist.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
         <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
-        <prop actor="props/units/heads/mace_su1.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/hele_su3.xml" attachpoint="helmet"/>
       </props>
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="hypaspist-armour-thorax">
-      <texture>skeletal/mace_hypaspist_1.dds</texture>
+    <variant frequency="1" name="Armour-Linen-Linothorax">
+      <texture>skeletal/hele_pezhetairoi_3.dds</texture>
     </variant>
-    <variant frequency="1" name="hypaspist-armour-cuirass">
-      <texture>skeletal/mace_hypaspist_2.dds</texture>
+    <variant frequency="1" name="Armour-Reinforced Linothorax">
+      <texture>skeletal/hele_pezhetairoi.dds</texture>
     </variant>
-    <variant frequency="1" name="hypaspist-armour-cuirass-2">
-      <texture>skeletal/mace_su1_hypaspist_1.dds</texture>
-    </variant>
-    <variant frequency="2" name="hypaspist-armour-cuirass-3">
-      <texture>skeletal/mace_su1_hypaspist_2.dds</texture>
+    <variant frequency="1" name="Armour-Bronze Cuirass">
+      <texture>skeletal/hele_pezhetairoi_2.dds</texture>
     </variant>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_e.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_e.xml
index e76c9fc92b..631ee929dd 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_e.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_e.xml
@@ -5,7 +5,7 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
-        <animation event="0.5" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="75"/>
+        <animation event="0.25" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
         <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/super_unit_3.xml b/binaries/data/mods/public/art/actors/units/hellenes/super_unit_3.xml
index a04ee46038..cfe8c80635 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/super_unit_3.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/super_unit_3.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="1" name="Base">
       <animations>
@@ -20,7 +18,6 @@
       </props>
     </variant>
   </group>
-
   <group>
     <variant frequency="5" name="Armour-Linen-Linothorax">
       <props>
@@ -44,7 +41,5 @@
       <texture>skeletal/hele_pezhetairoi_2.dds</texture>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/entities/gaia/fauna_wildebeest.xml b/binaries/data/mods/public/entities/gaia/fauna_wildebeest.xml
new file mode 100644
index 0000000000..0853ad41ae
--- /dev/null
+++ b/binaries/data/mods/public/entities/gaia/fauna_wildebeest.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity Parent="template_unit_fauna_hunt_skittish">
+	<Traits>
+		<Id>
+				<Specific>Wildebeest</Specific>
+			<History>The wildebeest (plural wildebeest, wildebeests or wildebai), also called the gnu, is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. Wildebeest are well known for their annual migration to new pastures in which vast numbers of wildebeest can be seen crossing rivers, such as the Mara River and dying in large numbers as they attempt to reach the other side. Many of them are eaten by crocodiles while others simply drown. Herds of wildebeest possesses what is known as "swarm intelligence", whereby the animals systematically explore and overcome obstacles as one when, for instance, crossing a river or defending against predator attacks.</History>
+		</Id>
+ 		<Supply>
+ 			<Max>150</Max>
+ 			<Type>food</Type>
+ 			<SubType>meat</SubType>
+ 		</Supply>
+		<Footprint>
+			<Radius>1.8</Radius>
+			<Height>1.8</Height>
+		</Footprint>
+	</Traits>
+	<Actions>
+			<Move>
+			<Speed>6.0</Speed>
+			<TurningRadius>1.0</TurningRadius>
+			<Run>
+				<Speed>15.0</Speed>
+				<Range>600.0</Range>
+				<RangeMin>5.0</RangeMin>
+			</Run>
+		</Move>
+	</Actions>
+ 	<Actor>fauna/wildebeest.xml</Actor>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/entities/other/camp_mace_hypaspist.xml b/binaries/data/mods/public/entities/other/camp_mace_hypaspist.xml
index b1061f4732..d651b4dda5 100644
--- a/binaries/data/mods/public/entities/other/camp_mace_hypaspist.xml
+++ b/binaries/data/mods/public/entities/other/camp_mace_hypaspist.xml
@@ -4,15 +4,18 @@
 	<Traits>
 		<Id>
 			<Icon_Cell>12</Icon_Cell>
-			<Specific>Argyraspides</Specific>
+			<Specific>Hypaspistai</Specific>
 			<Civ>Macedonians</Civ>
-			<History>The Hypaspists, or "shield bearers", were the flower of the Macedonian infantry. They were the most battle hardened veterans  within the army and followed Philip II and Alexander the Great into over a dozen full scale engagements. These heavily armed and opulently armoured units acted as an intermediary between the phalanx and the cavalry arm, many times charging headlong with Alexander into a breech in the enemy lines. Sometimes they fought as slow pikemen, like the Pezhetairoi with 6 meter "sarissas", and other times they fought as Hoplites with large aspides and 2.5 meter-long spears, or "dorata". In later times they became known as the Argyrapides, or "Silver Shields" when Alexander bestowed upon them armor and shields plated in pure silver, and played a decisive role in the early Diadochoi Wars of Alexander's "Successors."</History>
-		
+			<History>The Hypaspistai, or "shield bearers", were the flower of the Macedonian infantry. They were the most battle hardened veterans  within the army and followed Philip II and Alexander the Great into over a dozen full scale engagements. These heavily armed and opulently armoured units acted as an intermediary between the phalanx and the cavalry arm, many times charging headlong with Alexander into a breech in the enemy lines. Sometimes they fought as slow pikemen, like the Pezhetairoi with 6 meter "sarissas", and other times they fought as Hoplites with large aspides and 2.5 meter-long spears, or "dorata". In later times they became known as the Argyraspidai, or "Silver Shields" when Alexander bestowed upon them armor and shields plated in pure silver, and played a decisive role in the early Diadochoi Wars of Alexander's "Successors."</History>
 		</Id>
+		<Promotion>
+			<Entity>camp_mace_hypaspist_argyraspidai</Entity>
+			<Req>500</Req>
+		</Promotion>
 		<Creation>
 			<Resource>
- 				<Food>65</Food>
-				<Metal>120</Metal>
+ 				<Wood>75</Wood>
+				<Metal>50</Metal>
  			</Resource>
 		</Creation>		
 		<Armour>
diff --git a/binaries/data/mods/public/entities/other/camp_mace_hypaspist_argyraspidai.xml b/binaries/data/mods/public/entities/other/camp_mace_hypaspist_argyraspidai.xml
new file mode 100644
index 0000000000..cc4ea69b42
--- /dev/null
+++ b/binaries/data/mods/public/entities/other/camp_mace_hypaspist_argyraspidai.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity	Parent="camp_mace_hypaspist">
+	<Traits>
+		<Id>
+			<Icon_Cell>12</Icon_Cell>
+			<Specific>Hypaspistai Argyraspis</Specific>
+		</Id>
+		<Armour>
+			<Hack>10.0</Hack>
+			<Pierce>13.0</Pierce>
+			<Crush>15.0</Crush>
+		</Armour>
+		<Health>
+			<Max>145</Max>
+		</Health>
+	</Traits>
+	<Actions>
+ 		<Attack>
+			<Melee>
+ 				<Hack>20.0</Hack>
+ 				<Pierce>24.0</Pierce>
+			</Melee>
+
+			<Charge>
+				<Hack>40.0</Hack>
+				<Pierce>48.0</Pierce>
+			</Charge>	
+ 		</Attack>
+		<Move>
+			<Speed>5.0</Speed>
+			<Run>
+				<Speed>15.0</Speed>
+			</Run>
+		</Move>
+	</Actions>
+	<Actor>temp/mace_su1_argyraspis.xml</Actor>
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/entities/template_unit_infantry_ranged.xml b/binaries/data/mods/public/entities/template_unit_infantry_ranged.xml
index ef25dc5020..ce91191cf9 100644
--- a/binaries/data/mods/public/entities/template_unit_infantry_ranged.xml
+++ b/binaries/data/mods/public/entities/template_unit_infantry_ranged.xml
@@ -16,7 +16,7 @@
  				<Crush>0.0</Crush>
 				<MinRange>1.0</MinRange>
 				<Range>1.0</Range>
-				<Speed>1500</Speed>
+				<Speed>2000</Speed>
 				<ProjectileSpeed>28.0</ProjectileSpeed>
 			</Ranged>
  		</Attack>