diff --git a/aman/sys/aco/Constraints.py b/aman/sys/aco/Constraints.py
index 6b87dbb..550db87 100644
--- a/aman/sys/aco/Constraints.py
+++ b/aman/sys/aco/Constraints.py
@@ -8,19 +8,64 @@ class SpacingConstraints:
         self.WtcSpacing['H'] = {}
         self.WtcSpacing['J'] = {}
 
-        self.WtcSpacing['L']['L'] = 3
-        self.WtcSpacing['L']['M'] = 3
-        self.WtcSpacing['L']['S'] = 3
-        self.WtcSpacing['L']['J'] = 3
-        self.WtcSpacing['M']['L'] = 5
-        self.WtcSpacing['M']['M'] = 3
-        self.WtcSpacing['M']['S'] = 3
-        self.WtcSpacing['M']['J'] = 3
-        self.WtcSpacing['H']['L'] = 6
-        self.WtcSpacing['H']['M'] = 5
-        self.WtcSpacing['H']['S'] = 4
-        self.WtcSpacing['H']['J'] = 4
-        self.WtcSpacing['J']['L'] = 8
-        self.WtcSpacing['J']['M'] = 7
-        self.WtcSpacing['J']['S'] = 6
-        self.WtcSpacing['J']['J'] = 6
\ No newline at end of file
+        self.WtcSpacing['L']['L'] = 3.0
+        self.WtcSpacing['L']['M'] = 3.0
+        self.WtcSpacing['L']['S'] = 3.0
+        self.WtcSpacing['L']['J'] = 3.0
+        self.WtcSpacing['M']['L'] = 5.0
+        self.WtcSpacing['M']['M'] = 3.0
+        self.WtcSpacing['M']['S'] = 3.0
+        self.WtcSpacing['M']['J'] = 3.0
+        self.WtcSpacing['H']['L'] = 6.0
+        self.WtcSpacing['H']['M'] = 5.0
+        self.WtcSpacing['H']['S'] = 4.0
+        self.WtcSpacing['H']['J'] = 4.0
+        self.WtcSpacing['J']['L'] = 8.0
+        self.WtcSpacing['J']['M'] = 7.0
+        self.WtcSpacing['J']['S'] = 6.0
+        self.WtcSpacing['J']['J'] = 6.0
+
+        self.RecatSpacing = {}
+        self.RecatSpacing['A'] = {}
+        self.RecatSpacing['B'] = {}
+        self.RecatSpacing['C'] = {}
+        self.RecatSpacing['D'] = {}
+        self.RecatSpacing['E'] = {}
+        self.RecatSpacing['F'] = {}
+
+        self.RecatSpacing['A']['A'] = 3.0
+        self.RecatSpacing['A']['B'] = 3.0
+        self.RecatSpacing['A']['C'] = 3.0
+        self.RecatSpacing['A']['D'] = 3.0
+        self.RecatSpacing['A']['E'] = 3.0
+        self.RecatSpacing['A']['F'] = 3.0
+        self.RecatSpacing['B']['A'] = 4.0
+        self.RecatSpacing['B']['B'] = 4.0
+        self.RecatSpacing['B']['C'] = 4.0
+        self.RecatSpacing['B']['D'] = 4.0
+        self.RecatSpacing['B']['E'] = 4.0
+        self.RecatSpacing['B']['F'] = 4.0
+        self.RecatSpacing['C']['A'] = 5.0
+        self.RecatSpacing['C']['B'] = 5.0
+        self.RecatSpacing['C']['C'] = 5.0
+        self.RecatSpacing['C']['D'] = 5.0
+        self.RecatSpacing['C']['E'] = 5.0
+        self.RecatSpacing['C']['F'] = 5.0
+        self.RecatSpacing['D']['A'] = 6.0
+        self.RecatSpacing['D']['B'] = 4.0
+        self.RecatSpacing['D']['C'] = 3.0
+        self.RecatSpacing['D']['D'] = 3.0
+        self.RecatSpacing['D']['E'] = 2.5
+        self.RecatSpacing['D']['F'] = 2.5
+        self.RecatSpacing['E']['A'] = 7.0
+        self.RecatSpacing['E']['B'] = 5.0
+        self.RecatSpacing['E']['C'] = 4.0
+        self.RecatSpacing['E']['D'] = 4.0
+        self.RecatSpacing['E']['E'] = 3.0
+        self.RecatSpacing['E']['F'] = 3.0
+        self.RecatSpacing['F']['A'] = 8.0
+        self.RecatSpacing['F']['B'] = 6.0
+        self.RecatSpacing['F']['C'] = 5.0
+        self.RecatSpacing['F']['D'] = 5.0
+        self.RecatSpacing['F']['E'] = 4.0
+        self.RecatSpacing['F']['F'] = 3.0
diff --git a/icao/recat.py b/icao/recat.py
deleted file mode 100644
index d85dd12..0000000
--- a/icao/recat.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Recat departure separation in seconds
-# x = CAT A -> CAT F
-# y = CAT A -> CAT F
-# https://www.skybrary.aero/index.php/RECAT_-_Wake_Turbulence_Re-categorisation
-recatDeparture = [
-    [0, 100, 120, 140, 160, 180],
-    [0, 0, 0, 100, 120, 140],
-    [0, 0, 0, 80, 100, 120],
-    [0, 0, 0, 0, 0, 120],
-    [0, 0, 0, 0, 0, 100],
-    [0, 0, 0, 0, 0, 80],
-]
-
-#Recat Arrival in NM
-recatArrival = [
-    [3, 4, 5, 5, 6, 8],
-    [0, 3, 4, 4, 5, 7],
-    [0, 0, 3, 3, 4, 6],
-    [0, 0, 0, 0, 0, 5],
-    [0, 0, 0, 0, 0, 4],
-    [0, 0, 0, 0, 0, 3],
-]
\ No newline at end of file