Index: binaries/data/mods/public/simulation/data/civs/ptol.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/ptol.json
+++ binaries/data/mods/public/simulation/data/civs/ptol.json
@@ -127,7 +127,7 @@
 			"Count": 2
 		},
 		{
-			"Template": "units/ptol_infantry_archer_b",
+			"Template": "units/ptol_infantry_javelinist_b",
 			"Count": 2
 		},
 		{
Index: binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml
@@ -17,7 +17,7 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_infantry_pikeman_b
-      units/{civ}_infantry_archer_b
+      units/{civ}_infantry_javelinist_b
       units/{civ}_cavalry_archer_b
     </Entities>
   </ProductionQueue>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
@@ -16,6 +16,7 @@
       units/{civ}_hero_ptolemy_I
       units/{civ}_hero_ptolemy_IV
       units/{civ}_hero_cleopatra
+      units/{civ}_champion_infantry_pikemen
       units/{civ}_champion_cavalry
       units/{civ}_champion_elephant
     </Entities>
Index: binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_a.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_a.xml
@@ -7,6 +7,6 @@
     <Entity>units/ptol_infantry_archer_e</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/ptolemies/infantry_archer_b.xml</Actor>
+    <Actor>units/macedonians/infantry_archer_a.xml</Actor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml
@@ -18,15 +18,15 @@
     <Civ>ptol</Civ>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <SelectionGroupName>units/ptol_infantry_archer_b</SelectionGroupName>
-    <GenericName>Nubian Mercenary Archer</GenericName>
-    <SpecificName>Kousít Misthophóros Toxótēs</SpecificName>
+    <GenericName>Cretan Mercenary Archer</GenericName>
+    <SpecificName>Toxótēs Krētikós</SpecificName>
     <Icon>units/hele_infantry_archer.png</Icon>
-    <RequiredTechnology>phase_village</RequiredTechnology>
+    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/ptol_infantry_archer_a</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/ptolemies/infantry_archer_b.xml</Actor>
+    <Actor>units/macedonians/infantry_archer_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_e.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_e.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_e.xml
@@ -5,6 +5,6 @@
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
-    <Actor>units/ptolemies/infantry_archer_b.xml</Actor>
+    <Actor>units/macedonians/infantry_archer_e.xml</Actor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_nubian.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_nubian.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_nubian.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_infantry_ranged_archer">
+  <Cost>
+    <Resources>
+      <food op="add">-25</food>
+      <metal op="add">25</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <Civ>ptol</Civ>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
+    <SelectionGroupName>units/ptol_infantry_archer_b</SelectionGroupName>
+    <GenericName>Nubian Mercenary Archer</GenericName>
+    <SpecificName>Kousít Misthophóros Toxótēs</SpecificName>
+    <Icon>units/hele_infantry_archer.png</Icon>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+  <Promotion>
+    <Entity>units/ptol_infantry_archer_a</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/ptolemies/infantry_archer_b.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml
@@ -22,7 +22,7 @@
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <History>The thureophoroi (singular: thureophoros) was a type of infantry soldier, common in the 3rd to 1st century BCE, who carried a large oval shield called a thureos which had a type of metal strip boss and a central spine. They were armed with a long thrusting spear, javelins and a sword. They also usually wore an iron or bronze Macedonian helmet. The thureos was probably originally an adapted form of a Celtic shield. Thracian and Illyrian infantry probably adopted the shield before the Greeks. However it has been suggested that the thureos was brought to Greece after Pyrrhus of Epirus' campaigns in Italy, as his Oscan allies and Roman enemies used the scutum. Thureophoroi were a 3rd century development on the Peltast and wore no body armor, but did wear sturdy leather boots for quick movement. Thureophoroi could skirmish, as well as fight in a phalanx when necessary. They were often stationed on the flanks of the traditional pike phalanx as a flexible link between the heavier pikemen and the cavalry wings.</History>
     <Icon>units/mace_infantry_javelinist.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
+    <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/ptol_infantry_javelinist_a</Entity>