Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
@@ -16,8 +16,8 @@
     <Max>750</Max>
   </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
     <GenericName>War Elephant</GenericName>
+    <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
   </Identity>
   <Loot>
     <xp>300</xp>
@@ -32,7 +32,7 @@
       <Damage>
         <Hack>10</Hack>
         <Pierce>10</Pierce>
-        <Crush>25</Crush>
+        <Crush>20</Crush>
       </Damage>
     </Entity>
   </Resistance>
@@ -55,7 +55,6 @@
   </StatusBars>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
-    <WalkSpeed op="mul">0.95</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>100</Range>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_elephant">
-  <Attack replace="">
+  <Attack>
+    <Capture disable=""/>
     <Melee>
       <AttackName>Trunk</AttackName>
       <Damage>
         <Hack>20</Hack>
         <Pierce>0</Pierce>
-        <Crush>150.0</Crush>
+        <Crush>150</Crush>
       </Damage>
       <MaxRange>5.0</MaxRange>
       <PrepareTime>750</PrepareTime>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
@@ -11,17 +11,10 @@
       <MaxRange>6.0</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
-      <Bonuses>
-        <BonusCav>
-          <Classes>Cavalry</Classes>
-          <Multiplier>1.5</Multiplier>
-        </BonusCav>
-      </Bonuses>
       <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
   </Attack>
   <Identity>
-    <Tooltip>Counters: 1.5× vs Cavalry. Cannot attack Structures, Ships, or Siege Engines.</Tooltip>
     <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
-  <Attack replace="">
+  <Attack>
+    <Capture disable=""/>
     <Melee>
       <AttackName>Trunk</AttackName>
       <Damage>
-        <Hack>20.0</Hack>
+        <Hack>40</Hack>
         <Pierce>0</Pierce>
-        <Crush>50.0</Crush>
+        <Crush>300</Crush>
       </Damage>
       <MaxRange>5.0</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
+      <PrepareTime>750</PrepareTime>
+      <RepeatTime>1500</RepeatTime>
     </Melee>
   </Attack>
   <Cost>
     <Resources>
-      <food>500</food>
-      <metal>500</metal>
+      <food>600</food>
+      <metal>400</metal>
     </Resources>
   </Cost>
   <Footprint replace="">
@@ -27,8 +28,13 @@
     <Max>1500</Max>
   </Health>
   <Identity>
+    <GenericName>Hero Elephant</GenericName>
     <VisibleClasses datatype="tokens">Elephant Melee</VisibleClasses>
   </Identity>
+  <Loot>
+    <food>60</food>
+    <metal>40</metal>
+  </Loot>
   <Position>
     <TurnRate>3</TurnRate>
   </Position>
@@ -67,6 +73,5 @@
   </StatusBars>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
-    <WalkSpeed op="mul">0.95</WalkSpeed>
   </UnitMotion>
 </Entity>