diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
index c771bdfa2b..4463513126 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
@@ -7,7 +7,7 @@
         <Pierce>7</Pierce>
       </Damage>
       <MaxRange>60</MaxRange>
-      <PrepareTime>500</PrepareTime>
+      <PrepareTime>800</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Projectile>
         <Speed>100</Speed>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_crossbowman.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_crossbowman.xml
index c44b77e96f..f7f115082b 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_crossbowman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_crossbowman.xml
@@ -7,7 +7,7 @@
         <Pierce>20</Pierce>
       </Damage>
       <MaxRange>60</MaxRange>
-      <PrepareTime>2400</PrepareTime>
+      <PrepareTime>200</PrepareTime>
       <RepeatTime>3000</RepeatTime>
       <Projectile>
         <Speed>120</Speed>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml
index fb87ee75b6..dc8557b253 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml
@@ -7,7 +7,7 @@
         <Pierce>18</Pierce>
       </Damage>
       <MaxRange>30</MaxRange>
-      <PrepareTime>750</PrepareTime>
+      <PrepareTime>400</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Projectile>
         <Speed>70</Speed>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
index 7a1435e64a..97335a1de9 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
@@ -7,7 +7,7 @@
         <Pierce>14</Pierce>
       </Damage>
       <MaxRange>60</MaxRange>
-      <PrepareTime>500</PrepareTime>
+      <PrepareTime>800</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Projectile>
         <Speed>100</Speed>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_crossbowman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_crossbowman.xml
index c4be7e3569..40c1b42760 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_crossbowman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_crossbowman.xml
@@ -7,7 +7,7 @@
         <Pierce>40</Pierce>
       </Damage>
       <MaxRange>60</MaxRange>
-      <PrepareTime>2400</PrepareTime>
+      <PrepareTime>200</PrepareTime>
       <RepeatTime>3000</RepeatTime>
       <Projectile>
         <Speed>120</Speed>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml
index 7b8276a444..d9cbb16587 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml
@@ -7,7 +7,7 @@
         <Pierce>36</Pierce>
       </Damage>
       <MaxRange>30</MaxRange>
-      <PrepareTime>750</PrepareTime>
+      <PrepareTime>400</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Projectile>
         <Speed>70</Speed>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
index 667292c335..eb63b8c502 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
@@ -7,7 +7,7 @@
         <Pierce>13.5</Pierce>
       </Damage>
       <MaxRange>60</MaxRange>
-      <PrepareTime>500</PrepareTime>
+      <PrepareTime>800</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Projectile>
         <Speed>100</Speed>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_crossbowman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_crossbowman.xml
index 55b797c77f..0d9a06f9f3 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_crossbowman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_crossbowman.xml
@@ -7,7 +7,7 @@
         <Pierce>40</Pierce>
       </Damage>
       <MaxRange>60</MaxRange>
-      <PrepareTime>2400</PrepareTime>
+      <PrepareTime>200</PrepareTime>
       <RepeatTime>3000</RepeatTime>
       <Projectile>
         <Speed>120</Speed>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelineer.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelineer.xml
index 6d663726dd..27bf908e87 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelineer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelineer.xml
@@ -4,11 +4,11 @@
     <Ranged>
       <AttackName>Javelin</AttackName>
       <Damage>
-        <Pierce>26</Pierce>
+        <Pierce>32</Pierce>
       </Damage>
       <MaxRange>30</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
+      <PrepareTime>400</PrepareTime>
+      <RepeatTime>1250</RepeatTime>
       <Projectile>
         <Speed>70</Speed>
         <Spread>1.6</Spread>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
index 1bd2e96bde..25eb8846a0 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
@@ -7,7 +7,7 @@
         <Pierce>28</Pierce>
       </Damage>
       <MaxRange>60</MaxRange>
-      <PrepareTime>500</PrepareTime>
+      <PrepareTime>800</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Projectile>
         <Speed>100</Speed>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_crossbowman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_crossbowman.xml
index bce45065c1..d0c6210471 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_crossbowman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_crossbowman.xml
@@ -7,7 +7,7 @@
         <Pierce>80</Pierce>
       </Damage>
       <MaxRange>60</MaxRange>
-      <PrepareTime>2400</PrepareTime>
+      <PrepareTime>200</PrepareTime>
       <RepeatTime>3000</RepeatTime>
       <Projectile>
         <Speed>120</Speed>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml
index 0ef5763373..a34a374df1 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml
@@ -7,7 +7,7 @@
         <Pierce>60</Pierce>
       </Damage>
       <MaxRange>30</MaxRange>
-      <PrepareTime>750</PrepareTime>
+      <PrepareTime>400</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Projectile>
         <Speed>70</Speed>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
index 20987ac84d..7d7620e1b5 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
@@ -7,7 +7,7 @@
         <Pierce>27</Pierce>
       </Damage>
       <MaxRange>60</MaxRange>
-      <PrepareTime>500</PrepareTime>
+      <PrepareTime>800</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Projectile>
         <Speed>100</Speed>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_crossbowman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_crossbowman.xml
index c0480e479a..3f9c7a955c 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_crossbowman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_crossbowman.xml
@@ -7,7 +7,7 @@
         <Pierce>80</Pierce>
       </Damage>
       <MaxRange>60</MaxRange>
-      <PrepareTime>2400</PrepareTime>
+      <PrepareTime>200</PrepareTime>
       <RepeatTime>3000</RepeatTime>
       <Projectile>
         <Speed>120</Speed>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelineer.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelineer.xml
index 33dcb482ce..5ab7bb3c41 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelineer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelineer.xml
@@ -4,11 +4,11 @@
     <Ranged>
       <AttackName>Javelin</AttackName>
       <Damage>
-        <Pierce>50</Pierce>
+        <Pierce>62</Pierce>
       </Damage>
       <MaxRange>30</MaxRange>
-      <PrepareTime>600</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
+      <PrepareTime>400</PrepareTime>
+      <RepeatTime>1250</RepeatTime>
       <Projectile>
         <Speed>70</Speed>
         <Spread>0.8</Spread>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
index 6b93bf7315..645875181e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
@@ -7,7 +7,7 @@
         <Pierce>6.7</Pierce>
       </Damage>
       <MaxRange>60</MaxRange>
-      <PrepareTime>500</PrepareTime>
+      <PrepareTime>800</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Projectile>
         <Speed>100</Speed>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_crossbowman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_crossbowman.xml
index 4df422e038..0cd8ef2100 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_crossbowman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_crossbowman.xml
@@ -7,7 +7,7 @@
         <Pierce>20</Pierce>
       </Damage>
       <MaxRange>60</MaxRange>
-      <PrepareTime>2400</PrepareTime>
+      <PrepareTime>200</PrepareTime>
       <RepeatTime>3000</RepeatTime>
       <Projectile>
         <Speed>120</Speed>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelineer.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelineer.xml
index 0cb39ab89c..d95d0b7034 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelineer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelineer.xml
@@ -7,7 +7,7 @@
         <Pierce>16</Pierce>
       </Damage>
       <MaxRange>30</MaxRange>
-      <PrepareTime>750</PrepareTime>
+      <PrepareTime>400</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Projectile>
         <Speed>70</Speed>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
index 2f58815e26..050f287746 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
@@ -8,7 +8,7 @@
         <Crush>1.1</Crush>
       </Damage>
       <MaxRange>45</MaxRange>
-      <PrepareTime>750</PrepareTime>
+      <PrepareTime>400</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Projectile>
         <Speed>90</Speed>