Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
@@ -2,19 +2,18 @@
 <Entity parent="template_unit_champion_infantry">
   <Armour>
     <Hack op="add">1</Hack>
-    <Pierce op="add">1</Pierce>
+    <Pierce op="add">2</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Damage>
         <Hack>0</Hack>
         <Pierce>0</Pierce>
-        <Crush>10.5</Crush>
+        <Crush>14</Crush>
       </Damage>
       <MaxRange>3.5</MaxRange>
-      <PrepareTime>375</PrepareTime>
-      <RepeatTime>750</RepeatTime>
-      <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>
   <Cost>
@@ -29,11 +28,8 @@
   <Identity>
     <VisibleClasses datatype="tokens">Melee Maceman</VisibleClasses>
     <GenericName>Champion Maceman</GenericName>
-    <Formations datatype="tokens">
-      special/formations/testudo
-    </Formations>
   </Identity>
   <UnitMotion>
-    <WalkSpeed op="mul">1.4</WalkSpeed>
+    <WalkSpeed op="mul">1.3</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_maceman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_maceman.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_infantry">
+  <Armour>
+    <Hack op="add">2</Hack>
+    <Pierce op="add">3</Pierce>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>0</Pierce>
+        <Crush>28</Crush>
+      </Damage>
+      <MaxRange>3.5</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+    </Melee>
+  </Attack>
+  <Identity>
+    <VisibleClasses datatype="tokens">Melee Maceman</VisibleClasses>
+    <GenericName>Hero Maceman</GenericName>
+  </Identity>
+  <Vision>
+    <Range>80</Range>
+  </Vision>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_maceman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_maceman.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_infantry_melee">
+  <Armour>
+    <Hack>3</Hack>
+    <Pierce>4</Pierce>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Damage>
+        <Crush>7</Crush>
+      </Damage>
+      <PreferredClasses datatype="tokens">-Human</PreferredClasses>
+    </Melee>
+  </Attack>
+  <Cost>
+    <Resources>
+      <wood>40</wood>
+      <metal>10</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <VisibleClasses datatype="tokens">Maceman</VisibleClasses>
+    <GenericName>Maceman</GenericName>
+  </Identity>
+  <Loot>
+    <wood>4</wood>
+    <metal>1</metal>
+  </Loot>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
@@ -1,16 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_swordsman">
-  <Armour>
-    <Hack op="add">-1</Hack>
-  </Armour>
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack>3.0</Hack>
-        <Crush>2.5</Crush>
-      </Damage>
-    </Melee>
-  </Attack>
   <Builder>
     <Entities datatype="tokens">
       structures/kush_pyramid_small
@@ -28,19 +17,16 @@
   </Cost>
   <Identity>
     <Civ>kush</Civ>
-    <VisibleClasses datatype="tokens">-Swordsman Clubman Mercenary</VisibleClasses>
-    <SelectionGroupName>units/kush_infantry_clubman_b</SelectionGroupName>
-    <GenericName>Nuba Clubman</GenericName>
+    <GenericName>Nuba Maceman</GenericName>
     <SpecificName>nhw Noba</SpecificName>
+    <SelectionGroupName>units/kush_infantry_clubman_b</SelectionGroupName>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/kush_infantry_clubman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/kush_infantry_clubman_a</Entity>
   </Promotion>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.1</WalkSpeed>
-  </UnitMotion>
   <VisualActor>
     <Actor>units/kushites/infantry_clubman_b.xml</Actor>
   </VisualActor>