Index: binaries/data/mods/public/art/actors/units/athenians/cavalry_javelinist_a_r.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/athenians/cavalry_javelinist_a_r.xml
+++ binaries/data/mods/public/art/actors/units/athenians/cavalry_javelinist_a_r.xml
@@ -22,6 +22,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_cavalry_javelin.xml" name="attack_ranged"/>
+	<variant file="biped/attack_ranged_cavalary_second.xml"/>
     <variant file="biped/rider/promotion_shield.xml" />
     <variant file="biped/rider/attack_slaughter_shield_hele.xml"/>
     <variant file="biped/gather_meat.xml"/>
Index: binaries/data/mods/public/art/actors/units/athenians/cavalry_javelinist_b_r.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/athenians/cavalry_javelinist_b_r.xml
+++ binaries/data/mods/public/art/actors/units/athenians/cavalry_javelinist_b_r.xml
@@ -22,6 +22,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_cavalry_javelin.xml" name="attack_ranged"/>
+	<variant file="biped/attack_ranged_cavalary_second.xml"/>
     <variant file="biped/rider/promotion_shield.xml" />
     <variant file="biped/rider/attack_slaughter_shield_hele.xml"/>
     <variant file="biped/gather_meat.xml"/>
Index: binaries/data/mods/public/art/actors/units/athenians/cavalry_javelinist_e_r.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/athenians/cavalry_javelinist_e_r.xml
+++ binaries/data/mods/public/art/actors/units/athenians/cavalry_javelinist_e_r.xml
@@ -22,6 +22,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_cavalry_javelin.xml" name="attack_ranged"/>
+	<variant file="biped/attack_ranged_cavalary_second.xml"/>
     <variant file="biped/rider/promotion_shield.xml" />
     <variant file="biped/rider/attack_slaughter_shield_hele.xml"/>
     <variant file="biped/gather_meat.xml"/>
Index: binaries/data/mods/public/art/actors/units/athenians/hero_infantry_javelinist_iphicrates.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/athenians/hero_infantry_javelinist_iphicrates.xml
+++ binaries/data/mods/public/art/actors/units/athenians/hero_infantry_javelinist_iphicrates.xml
@@ -18,6 +18,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_javelinist_heavy.xml"/>
+	<variant file="biped/attack_ranged_second.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/death_infantry.xml"/>
Index: binaries/data/mods/public/art/actors/units/athenians/hero_infantry_javelinist_xenophon.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/athenians/hero_infantry_javelinist_xenophon.xml
+++ binaries/data/mods/public/art/actors/units/athenians/hero_infantry_javelinist_xenophon.xml
@@ -16,6 +16,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_javelinist_heavy.xml"/>
+	<variant file="biped/attack_ranged_second.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
Index: binaries/data/mods/public/art/actors/units/athenians/infantry_archer_a.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/athenians/infantry_archer_a.xml
+++ binaries/data/mods/public/art/actors/units/athenians/infantry_archer_a.xml
@@ -36,6 +36,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_archer.xml"/>
+	<variant file="biped/attack_ranged_second.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
Index: binaries/data/mods/public/art/actors/units/athenians/infantry_archer_b.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/athenians/infantry_archer_b.xml
+++ binaries/data/mods/public/art/actors/units/athenians/infantry_archer_b.xml
@@ -27,6 +27,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_archer.xml"/>
+	<variant file="biped/attack_ranged_second.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
Index: binaries/data/mods/public/art/actors/units/athenians/infantry_archer_c.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/athenians/infantry_archer_c.xml
+++ binaries/data/mods/public/art/actors/units/athenians/infantry_archer_c.xml
@@ -30,6 +30,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_archer_hip.xml"/>
+	<variant file="biped/attack_ranged_second.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/death_infantry.xml">
       <props>
Index: binaries/data/mods/public/art/actors/units/athenians/infantry_archer_e.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/athenians/infantry_archer_e.xml
+++ binaries/data/mods/public/art/actors/units/athenians/infantry_archer_e.xml
@@ -28,6 +28,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_archer.xml"/>
+	<variant file="biped/attack_ranged_second.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
Index: binaries/data/mods/public/art/actors/units/athenians/infantry_crossbowman_c.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/athenians/infantry_crossbowman_c.xml
+++ binaries/data/mods/public/art/actors/units/athenians/infantry_crossbowman_c.xml
@@ -18,6 +18,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_gastraphetes_fire.xml"/>
+	<variant file="biped/attack_ranged_second.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
Index: binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_a.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_a.xml
+++ binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_a.xml
@@ -43,6 +43,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_javelinist.xml"/>
+	<variant file="biped/attack_ranged_second.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
Index: binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_b.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_b.xml
+++ binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_b.xml
@@ -26,6 +26,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_javelinist.xml"/>
+	<variant file="biped/attack_ranged_second.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
Index: binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_e.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_e.xml
+++ binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_e.xml
@@ -28,6 +28,7 @@
   </group>
   <group>
     <variant file="biped/base_skirmisher.xml"/>
+	<variant file="biped/attack_ranged_second.xml"/>
     <variant file="biped/carry_food.xml"/>
     <variant file="biped/carry_meat.xml"/>
     <variant file="biped/carry_wood.xml"/>
Index: binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_a.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_a.xml
+++ binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_a.xml
@@ -26,6 +26,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_slinger.xml"/>
+	<variant file="biped/attack_ranged_second.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
Index: binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_b.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_b.xml
+++ binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_b.xml
@@ -26,6 +26,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_slinger.xml"/>
+	<variant file="biped/attack_ranged_second.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
Index: binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_e.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_e.xml
+++ binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_e.xml
@@ -26,6 +26,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_slinger.xml"/>
+	<variant file="biped/attack_ranged_second.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
Index: binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_a_r.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_a_r.xml
+++ binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_a_r.xml
@@ -36,6 +36,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_cavalry_javelin.xml" name="attack_ranged"/>
+	<variant file="biped/attack_ranged_cavalary_second.xml"/>
     <variant file="biped/rider/promotion_shield.xml" />
     <variant file="biped/rider/attack_slaughter_shield_rome.xml"/>
     <variant file="biped/gather_meat.xml"/>
Index: binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_b_r.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_b_r.xml
+++ binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_b_r.xml
@@ -42,6 +42,7 @@
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_cavalry_javelin.xml" name="attack_ranged"/>
     <variant file="biped/rider/promotion_shield.xml" />
+	<variant file="biped/attack_ranged_cavalary_second.xml"/>
     <variant file="biped/rider/attack_slaughter_shield_rome.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/rider/death_javelin.xml"/>
Index: binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_e_r.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_e_r.xml
+++ binaries/data/mods/public/art/actors/units/romans/cavalry_javelinist_e_r.xml
@@ -22,6 +22,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_cavalry_javelin.xml" name="attack_ranged"/>
+	<variant file="biped/attack_ranged_cavalary_second.xml"/>
     <variant file="biped/rider/promotion_shield.xml" />
     <variant file="biped/rider/attack_slaughter_shield_rome.xml"/>
     <variant file="biped/gather_meat.xml"/>
Index: binaries/data/mods/public/art/actors/units/romans/infantry_javelinist_a.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/romans/infantry_javelinist_a.xml
+++ binaries/data/mods/public/art/actors/units/romans/infantry_javelinist_a.xml
@@ -27,6 +27,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_javelinist.xml"/>
+	<variant file="biped/attack_ranged_second.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
Index: binaries/data/mods/public/art/actors/units/romans/infantry_javelinist_b.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/romans/infantry_javelinist_b.xml
+++ binaries/data/mods/public/art/actors/units/romans/infantry_javelinist_b.xml
@@ -27,6 +27,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_javelinist.xml"/>
+    <variant file="biped/attack_ranged_second.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
Index: binaries/data/mods/public/art/actors/units/romans/infantry_javelinist_e.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/romans/infantry_javelinist_e.xml
+++ binaries/data/mods/public/art/actors/units/romans/infantry_javelinist_e.xml
@@ -27,6 +27,7 @@
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_javelinist.xml"/>
+	<variant file="biped/attack_ranged_second.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
Index: binaries/data/mods/public/art/variants/biped/attack_ranged_cavalry_second.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/art/variants/biped/attack_ranged_cavalry_second.xml
@@ -0,0 +1,8 @@
+<variant name="attack_melee">
+  <animations>
+    <animation event="0.5" file="biped/new/sword_shield_attack_b.dae" name="attack_melee" speed="100"/>
+  </animations>
+  <props>
+    <prop actor="props/units/weapons/knife.xml" attachpoint="weapon_R"/>
+  </props>
+</variant>
Index: binaries/data/mods/public/art/variants/biped/attack_ranged_second.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/art/variants/biped/attack_ranged_second.xml
@@ -0,0 +1,8 @@
+<variant name="attack_melee">
+  <animations>
+    <animation event="0.5" file="biped/new/sword_shield_attack_b.dae" name="attack_melee" speed="100"/>
+  </animations>
+  <props>
+    <prop actor="props/units/weapons/knife.xml" attachpoint="weapon_R"/>
+  </props>
+</variant>
Index: binaries/data/mods/public/simulation/components/Attack.js
===================================================================
--- binaries/data/mods/public/simulation/components/Attack.js
+++ binaries/data/mods/public/simulation/components/Attack.js
@@ -387,6 +387,18 @@
 		types.splice(captureIndex, 1);
 	}
 
+	let rangeIndex = types.indexOf("Ranged");
+	if (rangeIndex != -1)
+	{
+		let cmpThisPosition = Engine.QueryInterface(this.entity, IID_Position);
+		let cmpTargetPosition = Engine.QueryInterface(target, IID_Position);
+		if (cmpThisPosition && cmpTargetPosition) {
+			let cmpUnitMotion = Engine.QueryInterface(this.entity, IID_UnitMotion);
+			if (cmpUnitMotion && cmpUnitMotion.IsInTargetRange(target, 0, this.template.Ranged.MinRange))
+				types.splice(rangeIndex, 1);
+		}
+	}
+
 	let isPreferred = className => this.GetPreferredClasses(className).some(isTargetClass);
 
 	return types.sort((a, b) =>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
@@ -6,12 +6,21 @@
     <Crush>10</Crush>
   </Armour>
   <Attack>
+    <Melee>
+      <Hack>1</Hack>
+      <Pierce>0</Pierce>
+      <Crush>0.0</Crush>
+      <MaxRange>2.2</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
+    </Melee>
     <Ranged>
       <Hack>0</Hack>
       <Pierce>1.5</Pierce>
       <Crush>0</Crush>
       <MaxRange>10.0</MaxRange>
-      <MinRange>0.0</MinRange>
+      <MinRange>2.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <Gravity>9.81</Gravity>
       <PrepareTime>750</PrepareTime>