diff --git a/binaries/data/mods/official/entities/Template values - resources.xls b/binaries/data/mods/official/entities/Template values - resources.xls
index 3becc766f3..f1f20c72da 100644
Binary files a/binaries/data/mods/official/entities/Template values - resources.xls and b/binaries/data/mods/official/entities/Template values - resources.xls differ
diff --git a/binaries/data/mods/official/entities/template_unit_cavalry_melee_spearman.xml b/binaries/data/mods/official/entities/template_unit_cavalry_melee_spearman.xml
index 9a82cdaa0a..8e53674382 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry_melee_spearman.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry_melee_spearman.xml
@@ -25,8 +25,8 @@
 		
 		<Armour>
 			<Hack>0.0</Hack>
-			<Pierce>15.0</Pierce>
-			<Crush>1.0</Crush>
+			<Pierce>30.0</Pierce>
+			<Crush>5.0</Crush>
 		</Armour>
 </Traits>
 
@@ -35,8 +35,8 @@
  		<Attack>
 			<Melee>
  				<Hack>0.0</Hack>
- 				<Pierce>30.0</Pierce>
- 				<Crush>5.0</Crush>
+ 				<Pierce>15.0</Pierce>
+ 				<Crush>1.0</Crush>
 			</Melee>
  		</Attack>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_cavalry_melee_swordsman.xml b/binaries/data/mods/official/entities/template_unit_cavalry_melee_swordsman.xml
index fdb377e823..bfc3fdc02e 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry_melee_swordsman.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry_melee_swordsman.xml
@@ -23,9 +23,9 @@
  			</Resource>
 		</Creation>
 		<Armour>
-			<Hack>20.0</Hack>
-			<Pierce>10.0</Pierce>
-			<Crush>5.0</Crush>
+			<Hack>50.0</Hack>
+			<Pierce>20.0</Pierce>
+			<Crush>0.0</Crush>
 		</Armour>
 	</Traits>
 
@@ -35,9 +35,9 @@
 	<Actions>
  		<Attack>
 			<Melee>
- 				<Hack>50.0</Hack>
- 				<Pierce>20.0</Pierce>
- 				<Crush>0.0</Crush>
+ 				<Hack>20.0</Hack>
+ 				<Pierce>10.0</Pierce>
+ 				<Crush>5.0</Crush>
 			</Melee>
  		</Attack>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_cavalry_ranged_archer.xml b/binaries/data/mods/official/entities/template_unit_cavalry_ranged_archer.xml
index ca52e24d04..da3cc8b6d9 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry_ranged_archer.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry_ranged_archer.xml
@@ -24,7 +24,7 @@
 		</Creation>
 		<Armour>
 			<Hack>0.0</Hack>
-			<Pierce>15.0</Pierce>
+			<Pierce>25.0</Pierce>
 			<Crush>0.0</Crush>
 		</Armour>		
 	</Traits>
@@ -35,7 +35,7 @@
  		<Attack>
 			<Ranged>
  				<Hack>0.0</Hack>
- 				<Pierce>50.0</Pierce>
+ 				<Pierce>15.0</Pierce>
  				<Crush>0.0</Crush>
 			</Ranged>
  		</Attack>
diff --git a/binaries/data/mods/official/entities/template_unit_cavalry_ranged_javelinist.xml b/binaries/data/mods/official/entities/template_unit_cavalry_ranged_javelinist.xml
index d3f133cf72..539c8c01e5 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry_ranged_javelinist.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry_ranged_javelinist.xml
@@ -25,7 +25,7 @@
 		<Armour>
 			<Hack>0.0</Hack>
 			<Pierce>20.0</Pierce>
-			<Crush>0.0</Crush>
+			<Crush>3.0</Crush>
 		</Armour>
 	</Traits>
 
@@ -35,8 +35,8 @@
  		<Attack>
 			<Ranged>
  				<Hack>0.0</Hack>
- 				<Pierce>50.0</Pierce>
- 				<Crush>10.0</Crush>
+ 				<Pierce>15.0</Pierce>
+ 				<Crush>1.0</Crush>
 			</Ranged>
  		</Attack>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_hero.xml b/binaries/data/mods/official/entities/template_unit_hero.xml
index 29c88d981b..bc0fb2e1c5 100644
--- a/binaries/data/mods/official/entities/template_unit_hero.xml
+++ b/binaries/data/mods/official/entities/template_unit_hero.xml
@@ -20,10 +20,10 @@
 		</Creation>
 		
 		<Armour>
-			<Hack>3.0</Hack>
-			<Pierce>3.0</Pierce>
-			<Crush>1000.0</Crush>
-		</Armour>	
+			<Hack>250.0</Hack>
+			<Pierce>180.0</Pierce>
+			<Crush>100.0</Crush>
+		</Armour>>	
 
 		<Health>
 			<RegenRate>0.2</RegenRate>
@@ -40,11 +40,7 @@
 		<MiniMap>
 			<Type>Hero</Type>
 		</MiniMap>
-		<Armour>
-			<Hack>200.0</Hack>
-			<Pierce>130.0</Pierce>
-			<Crush>100.0</Crush>
-		</Armour>
+
 	</Traits>
 	
 
@@ -53,9 +49,9 @@
 	<Actions>
 		<Attack>
 			<Melee>
-				<Hack>250.0</Hack>
-				<Pierce>180.0</Pierce>	
-				<Crush>90.0</Crush>	
+				<Hack>175.0</Hack>
+				<Pierce>150.0</Pierce>	
+				<Crush>115.0</Crush>	
 				<Range>5.0</Range>
 				<Speed>1500</Speed>
 			</Melee>
diff --git a/binaries/data/mods/official/entities/template_unit_infantry_melee_spearman.xml b/binaries/data/mods/official/entities/template_unit_infantry_melee_spearman.xml
index 386acb0304..9472fc8d07 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry_melee_spearman.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry_melee_spearman.xml
@@ -25,8 +25,8 @@
 		</Creation>
 		<Armour>
 			<Hack>0.0</Hack>
-			<Pierce>5.0</Pierce>
-			<Crush>1.0</Crush>
+			<Pierce>11.0</Pierce>
+			<Crush>8.0</Crush>
 		</Armour>		
 	</Traits>
 	
@@ -36,8 +36,8 @@
  		<Attack>
 			<Melee>
  				<Hack>0.0</Hack>
- 				<Pierce>20.0</Pierce>
- 				<Crush>10.0</Crush>
+ 				<Pierce>5.0</Pierce>
+ 				<Crush>1.0</Crush>
 			</Melee>
  		</Attack>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_infantry_melee_swordsman.xml b/binaries/data/mods/official/entities/template_unit_infantry_melee_swordsman.xml
index ec35468f9d..1f1f5d3d1a 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry_melee_swordsman.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry_melee_swordsman.xml
@@ -23,8 +23,8 @@
  			</Resource>
 		</Creation>
 		<Armour>
-			<Hack>10.0</Hack>
-			<Pierce>1.0</Pierce>
+			<Hack>15.0</Hack>
+			<Pierce>8.0</Pierce>
 			<Crush>0.0</Crush>
 		</Armour>		
 	</Traits>
@@ -34,8 +34,8 @@
 	<Actions>
  		<Attack>
 			<Melee>
- 				<Hack>20.0</Hack>
- 				<Pierce>5.0</Pierce>
+ 				<Hack>10.0</Hack>
+ 				<Pierce>1.0</Pierce>
  				<Crush>0.0</Crush>
 			</Melee>
  		</Attack>
diff --git a/binaries/data/mods/official/entities/template_unit_infantry_ranged_archer.xml b/binaries/data/mods/official/entities/template_unit_infantry_ranged_archer.xml
index 6e1fe908f7..0562e7a6ed 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry_ranged_archer.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry_ranged_archer.xml
@@ -36,7 +36,7 @@
  		<Attack>
 			<Ranged>
  				<Hack>0.0</Hack>
- 				<Pierce>20.0</Pierce>
+ 				<Pierce>8.0</Pierce>
  				<Crush>0.0</Crush>
 			</Ranged>
  		</Attack>
diff --git a/binaries/data/mods/official/entities/template_unit_infantry_ranged_javelinist.xml b/binaries/data/mods/official/entities/template_unit_infantry_ranged_javelinist.xml
index 66f9335df1..590e54bde3 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry_ranged_javelinist.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry_ranged_javelinist.xml
@@ -24,7 +24,7 @@
 		</Creation>
 		<Armour>
 			<Hack>0.0</Hack>
-			<Pierce>15.0</Pierce>
+			<Pierce>8.0</Pierce>
 			<Crush>0.0</Crush>
 		</Armour>		
 	</Traits>
@@ -35,7 +35,7 @@
  		<Attack>
 			<Ranged>
  				<Hack>0.0</Hack>
- 				<Pierce>20.0</Pierce>
+ 				<Pierce>5.0</Pierce>
  				<Crush>0.0</Crush>
 			</Ranged>
  		</Attack>
diff --git a/binaries/data/mods/official/entities/template_unit_infantry_ranged_slinger.xml b/binaries/data/mods/official/entities/template_unit_infantry_ranged_slinger.xml
index 2151d0eb6a..30a78ab4ca 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry_ranged_slinger.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry_ranged_slinger.xml
@@ -26,7 +26,7 @@
 		<Armour>
 			<Hack>0.0</Hack>
 			<Pierce>5.0</Pierce>
-			<Crush>10.0</Crush>
+			<Crush>11.0</Crush>
 		</Armour>		
 	</Traits>
 
@@ -38,7 +38,7 @@
 			<Ranged>
  				<Hack>0.0</Hack>
  				<Pierce>0.0</Pierce>
- 				<Crush>20.0</Crush>
+ 				<Crush>8.0</Crush>
 			</Ranged>
  		</Attack>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_mechanical_siege_ballista.xml b/binaries/data/mods/official/entities/template_unit_mechanical_siege_ballista.xml
index 5dae29b46d..a474a2b1bd 100644
--- a/binaries/data/mods/official/entities/template_unit_mechanical_siege_ballista.xml
+++ b/binaries/data/mods/official/entities/template_unit_mechanical_siege_ballista.xml
@@ -21,9 +21,9 @@
  			</Resource>
 		</Creation>
 		<Armour>
-			<Hack>120.0</Hack>
-			<Pierce>150.0</Pierce>
-			<Crush>60.0</Crush>
+			<Hack>60.0</Hack>
+			<Pierce>140.0</Pierce>
+			<Crush>40.0</Crush>
 		</Armour>
 	</Traits>
 	
@@ -33,8 +33,8 @@
  		<Attack>
 			<Ranged>
  				<Hack>0.0</Hack>
- 				<Pierce>150.0</Pierce>
- 				<Crush>20.0</Crush>
+ 				<Pierce>180.0</Pierce>
+ 				<Crush>60.0</Crush>
 			</Ranged>
  		</Attack>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_mechanical_siege_onager.xml b/binaries/data/mods/official/entities/template_unit_mechanical_siege_onager.xml
index f368bd27af..7d1b5acb6c 100644
--- a/binaries/data/mods/official/entities/template_unit_mechanical_siege_onager.xml
+++ b/binaries/data/mods/official/entities/template_unit_mechanical_siege_onager.xml
@@ -20,9 +20,9 @@
  			</Resource>
 		</Creation>
 		<Armour>
-			<Hack>170.0</Hack>
-			<Pierce>90.0</Pierce>
-			<Crush>120.0</Crush>
+			<Hack>20.0</Hack>
+			<Pierce>80.0</Pierce>
+			<Crush>150.0</Crush>
 		</Armour>
 	</Traits>
 
@@ -31,9 +31,9 @@
 	<Actions>
  		<Attack>
 			<Ranged>
- 				<Hack>20.0</Hack>
- 				<Pierce>80.0</Pierce>
- 				<Crush>150.0</Crush>
+ 				<Hack>80.0</Hack>
+ 				<Pierce>200.0</Pierce>
+ 				<Crush>85.0</Crush>
 			</Ranged>
  		</Attack>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_mechanical_siege_ram.xml b/binaries/data/mods/official/entities/template_unit_mechanical_siege_ram.xml
index 60dd28918a..b3f6032a23 100644
--- a/binaries/data/mods/official/entities/template_unit_mechanical_siege_ram.xml
+++ b/binaries/data/mods/official/entities/template_unit_mechanical_siege_ram.xml
@@ -19,9 +19,9 @@
  			</Resource>
 		</Creation>
 		<Armour>
-			<Hack>200.0</Hack>
-			<Pierce>120.0</Pierce>
-			<Crush>220.0</Crush>
+			<Hack>30.0</Hack>
+			<Pierce>70.0</Pierce>
+			<Crush>70.0</Crush>
 		</Armour>
 	</Traits>
 	
@@ -31,8 +31,8 @@
 	<Actions>
  		<Attack>
 			<Ranged>
- 				<Hack>0.0</Hack>
- 				<Pierce>0.0</Pierce>
+ 				<Hack>80.0</Hack>
+ 				<Pierce>120.0</Pierce>
  				<Crush>250.0</Crush>
 			</Ranged>
  		</Attack>