diff --git a/binaries/data/mods/public/simulation/data/civs/spart.json b/binaries/data/mods/public/simulation/data/civs/spart.json
index 197a6fe8e1..6b98cd96d3 100644
--- a/binaries/data/mods/public/simulation/data/civs/spart.json
+++ b/binaries/data/mods/public/simulation/data/civs/spart.json
@@ -31,8 +31,13 @@
 		},
 		{
 			"Name": "Laws of Lycurgus",
-			"History": "Under the constitution written by the mythical lawgiver Lycurgus, the institution of the Agoge was established, where Spartans were trained from the age of 6 to be superior warriors in defense of the Spartan state.",
+			"History": "Under the constitution written by the mythical lawgiver Lycurgus, society was shaped around the training and development of superior warriors in defense of the Spartan state.",
 			"Description": "Champion Hoplites are available in village phase, and can promote to highly experienced Olympic Champions."
+		},
+		{
+			"Name": "Agoge",
+			"History": "The institution of the Agoge was established to rigorously train Spartan boys from the age of 6 to be fearsome warriors.",
+			"Description": "Champion Hoplites 10% faster attack rate."
 		}
 	],
 	"WallSets": [
diff --git a/binaries/data/mods/public/simulation/data/technologies/tyrtean_paeans.json b/binaries/data/mods/public/simulation/data/technologies/tyrtean_paeans.json
index fc1a20f22d..589cd39bfa 100644
--- a/binaries/data/mods/public/simulation/data/technologies/tyrtean_paeans.json
+++ b/binaries/data/mods/public/simulation/data/technologies/tyrtean_paeans.json
@@ -3,17 +3,17 @@
 	"description": "Paeans were battle hymns that were sung by the Hoplites when they charged the enemy lines. One of the first known Paeans was composed by Tirteus, a warrior poet of Sparta, during the First Messenian War.",
 	"cost": {
 		"food": 200,
-		"metal": 200
+		"metal": 100
 	},
 	"requirements": {
 		"all": [
-			{ "tech": "phase_town" },
+			{ "tech": "phase_village" },
 			{ "civ": "spart" }
 		]
 	},
-	"requirementsTooltip": "Unlocked in Town Phase.",
+	"requirementsTooltip": "Unlocked in Village Phase.",
 	"icon": "walk.png",
-	"researchTime": 50,
+	"researchTime": 30,
 	"tooltip": "Champion Hoplites +10% movement speed.",
 	"modifications": [
 		{ "value": "UnitMotion/WalkSpeed", "multiply": 1.1 }
diff --git a/binaries/data/mods/public/simulation/templates/structures/spart/gerousia.xml b/binaries/data/mods/public/simulation/templates/structures/spart/gerousia.xml
index 0cb3594d29..f787d01afa 100644
--- a/binaries/data/mods/public/simulation/templates/structures/spart/gerousia.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/spart/gerousia.xml
@@ -37,11 +37,17 @@
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
   <ProductionQueue/>
+  <Trainer>
+    <BatchTimeModifier>0.7</BatchTimeModifier>
+    <Entities datatype="tokens">
+      units/{civ}/hero_leonidas
+      units/{civ}/hero_brasidas
+      units/{civ}/hero_agis
+    </Entities>
+  </Trainer>
   <Researcher>
     <Technologies datatype="tokens">
-      agoge
       krypteia
-      tyrtean_paeans
       unlock_neodamodes
     </Technologies>
   </Researcher>
diff --git a/binaries/data/mods/public/simulation/templates/structures/spart/syssiton.xml b/binaries/data/mods/public/simulation/templates/structures/spart/syssiton.xml
index facba3fae4..a1fe38e28b 100644
--- a/binaries/data/mods/public/simulation/templates/structures/spart/syssiton.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/spart/syssiton.xml
@@ -3,8 +3,8 @@
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
-      <stone>200</stone>
-      <metal>200</metal>
+      <stone>150</stone>
+      <metal>150</metal>
     </Resources>
   </Cost>
   <Footprint>
@@ -31,8 +31,8 @@
     </Requirements>
   </Identity>
   <Loot>
-    <stone>40</stone>
-    <metal>40</metal>
+    <stone>30</stone>
+    <metal>30</metal>
   </Loot>
   <Obstruction>
     <Static width="15.0" depth="25.0"/>
@@ -44,6 +44,9 @@
       <constructed>interface/complete/building/complete_gymnasium.xml</constructed>
     </SoundGroups>
   </Sound>
+  <Population>
+    <Bonus>10</Bonus>
+  </Population>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>38</Radius>
@@ -53,11 +56,13 @@
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}/champion_infantry_spear
-      units/{civ}/hero_leonidas
-      units/{civ}/hero_brasidas
-      units/{civ}/hero_agis
     </Entities>
   </Trainer>
+  <Researcher>
+    <Technologies datatype="tokens">
+      tyrtean_paeans
+    </Technologies>
+  </Researcher>
   <Vision>
     <Range>40</Range>
   </Vision>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_spear.xml b/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_spear.xml
index 2b9d50ecd7..290256ad18 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_spear.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_spear.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="hoplite|spec_champ|template_unit_champion_infantry_spearman">
+  <Attack>
+    <Melee>
+      <RepeatTime>900</RepeatTime>
+    </Melee>
+  </Attack>
   <Identity>
     <Civ>spart</Civ>
     <Lang>greek</Lang>