Index: binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_01.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_01.json
+++ binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_01.json
@@ -1,29 +0,0 @@
-{
-	"genericName": "Close Combat Cavalry Training",
-	"specificName": {
-		"athen": "Xyston",
-		"mace": "Xyston",
-		"ptol": "Xyston",
-		"rome": "Hasta",
-		"sele": "Xyston",
-		"spart": "Xyston"
-	},
-	"description": "Training increases melee attack.",
-	"cost": {
-		"food": 500,
-		"wood": 750,
-		"metal": 350
-	},
-	"requirements": { "tech": "phase_town" },
-	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "horse_trainer.png",
-	"researchTime": 40,
-	"tooltip": "Cavalry +20% melee attack damage.",
-	"modifications": [
-		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 }
-	],
-	"affects": ["Cavalry"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_02.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_02.json
+++ binaries/data/mods/public/simulation/data/technologies/attack_cavalry_melee_02.json
@@ -1,30 +0,0 @@
-{
-	"genericName": "Iron Weapons",
-	"specificName": {
-		"athen": "Xyston",
-		"mace": "Xyston",
-		"ptol": "Xyston",
-		"rome": "Hasta",
-		"sele": "Xyston",
-		"spart": "Xyston"
-	},
-	"description": "Replaces bronze weapons with iron.",
-	"cost": {
-		"food": 500,
-		"wood": 500,
-		"metal": 500
-	},
-	"supersedes": "attack_cavalry_melee_01",
-	"requirements": { "tech": "phase_city" },
-	"requirementsTooltip": "Unlocked in City Phase.",
-	"icon": "spear_cavalry.png",
-	"researchTime": 40,
-	"tooltip": "Cavalry +20% melee attack damage.",
-	"modifications": [
-		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 }
-	],
-	"affects": ["Cavalry"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_01.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_01.json
+++ binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_01.json
@@ -1,21 +0,0 @@
-{
-	"genericName": "Ranged Combat Cavalry Training",
-	"description": "Training increases ranged attack.",
-	"cost": {
-		"food": 500,
-		"wood": 750,
-		"metal": 350
-	},
-	"requirements": { "tech": "phase_town" },
-	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "horse_rider.png",
-	"researchTime": 40,
-	"tooltip": "Cavalry +20% ranged attack damage.",
-	"modifications": [
-		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 }
-	],
-	"affects": ["Cavalry"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_02.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_02.json
+++ binaries/data/mods/public/simulation/data/technologies/attack_cavalry_ranged_02.json
@@ -1,22 +0,0 @@
-{
-	"genericName": "Iron Weapons",
-	"description": "Replaces bronze weapons with iron.",
-	"cost": {
-		"food": 500,
-		"wood": 500,
-		"metal": 500
-	},
-	"supersedes": "attack_cavalry_ranged_01",
-	"requirements": { "tech": "phase_city" },
-	"requirementsTooltip": "Unlocked in City Phase.",
-	"icon": "horse_rider.png",
-	"researchTime": 40,
-	"tooltip": "Cavalry +20% ranged attack damage.",
-	"modifications": [
-		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 }
-	],
-	"affects": ["Cavalry"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_01.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_01.json
+++ binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_01.json
@@ -1,30 +0,0 @@
-{
-	"genericName": "Side Arms",
-	"specificName": {
-		"athen": "Xiphos",
-		"mace": "Xiphos",
-		"ptol": "Xiphos",
-		"rome": "Pugio",
-		"sele": "Xiphos",
-		"spart": "Xiphos"
-	},
-	"description": "Often, an infantryman would carry a secondary weapon in addition to his primary weapon of choice, to be drawn when the primary weapon has failed or been broken.",
-	"cost": {
-		"food": 500,
-		"wood": 500,
-		"stone": 250,
-		"metal": 250
-	},
-	"requirements": { "tech": "phase_town" },
-	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "sword.png",
-	"researchTime": 40,
-	"tooltip": "Infantry +20% melee attack damage.",
-	"modifications": [
-		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 }
-	],
-	"affects": ["Infantry"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_02.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_02.json
+++ binaries/data/mods/public/simulation/data/technologies/attack_infantry_melee_02.json
@@ -1,23 +0,0 @@
-{
-	"genericName": "Iron Weapons",
-	"description": "Using iron instead of bronze gave weapons additional power.",
-	"cost": {
-		"food": 500,
-		"wood": 500,
-		"stone": 250,
-		"metal": 450
-	},
-	"supersedes": "attack_infantry_melee_01",
-	"requirements": { "tech": "phase_city" },
-	"requirementsTooltip": "Unlocked in City Phase.",
-	"icon": "sword_cross.png",
-	"researchTime": 40,
-	"tooltip": "Infantry +20% melee attack damage.",
-	"modifications": [
-		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 }
-	],
-	"affects": ["Infantry"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_01.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_01.json
+++ binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_01.json
@@ -1,29 +0,0 @@
-{
-	"genericName": "Ranged Infantry Irregulars",
-	"specificName": {
-		"athen": "Ataktoi",
-		"mace": "Ataktoi",
-		"ptol": "Ataktoi",
-		"sele": "Ataktoi",
-		"spart": "Ataktoi"
-	},
-	"description": "Training increases damage of ranged infantry.",
-	"cost": {
-		"food": 500,
-		"wood": 500,
-		"stone": 250,
-		"metal": 250
-	},
-	"requirements": { "tech": "phase_town" },
-	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "arrow.png",
-	"researchTime": 40,
-	"tooltip": "Infantry +20% ranged attack damage.",
-	"modifications": [
-		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 }
-	],
-	"affects": ["Infantry"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_02.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_02.json
+++ binaries/data/mods/public/simulation/data/technologies/attack_infantry_ranged_02.json
@@ -1,30 +0,0 @@
-{
-	"genericName": "Ranged Infantry Masterclass",
-	"specificName": {
-		"athen": "Ataktoi",
-		"mace": "Ataktoi",
-		"ptol": "Ataktoi",
-		"sele": "Ataktoi",
-		"spart": "Ataktoi"
-	},
-	"description": "Training increases damage of ranged infantry.",
-	"cost": {
-		"food": 500,
-		"wood": 500,
-		"stone": 250,
-		"metal": 350
-	},
-	"supersedes": "attack_infantry_ranged_01",
-	"requirements": { "tech": "phase_city" },
-	"requirementsTooltip": "Unlocked in City Phase.",
-	"icon": "javelin_thong.png",
-	"researchTime": 40,
-	"tooltip": "Infantry +20% ranged attack damage.",
-	"modifications": [
-		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
-		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 }
-	],
-	"affects": ["Infantry"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_01.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_01.json
+++ binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_01.json
@@ -0,0 +1,20 @@
+{
+	"genericName": "Iron Weapons",
+	"description": "Replaces bronze weapons with iron.",
+	"cost": {
+		"food": 1200,
+		"metal": 600
+	},
+	"requirements": { "tech": "phase_town" },
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "sword.png",
+	"researchTime": 40,
+	"tooltip": "Soldiers +15% melee attack damage.",
+	"modifications": [
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.15 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.15 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.15 }
+	],
+	"affects": ["Soldier !Elephant"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_02.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_02.json
+++ binaries/data/mods/public/simulation/data/technologies/soldier_attack_melee_02.json
@@ -0,0 +1,21 @@
+{
+	"genericName": "Close Combat Training",
+    "description": "Training increases melee attack.",
+	"cost": {
+		"food": 1500,
+		"metal": 750
+	},
+	"supersedes": "soldier_attack_melee_01",
+	"requirements": { "tech": "phase_city" },
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "sword_cross.png",
+	"researchTime": 40,
+	"tooltip": "Soldiers +15% melee attack damage.",
+	"modifications": [
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.15 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.15 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.15 }
+	],
+	"affects": ["Soldier !Elephant"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_01.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_01.json
+++ binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_01.json
@@ -0,0 +1,20 @@
+{
+	"genericName": "Iron Weapons",
+	"description": "Replaces bronze weapons with iron.",
+	"cost": {
+		"wood": 1200,
+		"metal": 600
+	},
+	"requirements": { "tech": "phase_town" },
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "arrow.png",
+	"researchTime": 40,
+	"tooltip": "Soldiers +15% ranged attack damage.",
+	"modifications": [
+		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.15 },
+		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.15 },
+		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.15 }
+	],
+	"affects": ["Soldier"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_02.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_02.json
+++ binaries/data/mods/public/simulation/data/technologies/soldier_attack_ranged_02.json
@@ -0,0 +1,21 @@
+{
+	"genericName": "Ranged Combat Training",
+	"description": "Training increases ranged attack.",
+	"cost": {
+		"wood": 1500,
+		"metal": 750
+	},
+	"supersedes": "soldier_attack_ranged_01",
+	"requirements": { "tech": "phase_city" },
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "arrow_accuracy.png",
+	"researchTime": 40,
+	"tooltip": "Soldiers +15% ranged attack damage.",
+	"modifications": [
+		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.15 },
+		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.15 },
+		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.15 }
+	],
+	"affects": ["Soldier"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml
@@ -35,14 +35,10 @@
   </Obstruction>
   <ProductionQueue>
     <Technologies datatype="tokens">
-      attack_infantry_melee_01
-      attack_infantry_melee_02
-      attack_infantry_ranged_01
-      attack_infantry_ranged_02
-      attack_cavalry_melee_01
-      attack_cavalry_melee_02
-      attack_cavalry_ranged_01
-      attack_cavalry_ranged_02
+      soldier_attack_melee_01
+      soldier_attack_melee_02
+      soldier_attack_ranged_01
+      soldier_attack_ranged_02
       soldier_resistance_hack_01
       soldier_resistance_hack_02
       soldier_resistance_pierce_01