diff --git a/final/AF/MAR/GMMN35s.txt b/final/AF/MAR/GMMN35s.txt
index c9b3c6e..ae26f08 100644
--- a/final/AF/MAR/GMMN35s.txt
+++ b/final/AF/MAR/GMMN35s.txt
@@ -12,39 +12,17 @@ usa = false
 metric = false
 separation = 3
 boundary =
-	N032.39.16.000,W007.09.32.000
-	N032.37.10.000,W007.21.58.000
-	N032.45.37.000,W008.24.46.000
-	N032.39.16.000,W007.09.32.000
-	N033.03.51.000,W007.03.54.000
-	N033.31.21.000,W006.35.54.000
-	N033.42.38.000,W006.21.38.000
-	N033.43.09.568,W006.20.53.182
-	N033.46.29.181,W006.17.26.689
-	N033.50.13.160,W006.14.40.561
-	N034.11.47.000,W006.12.45.000
-	N034.11.33.610,W006.12.38.890
-	N034.07.17.122,W006.11.24.668
-	N034.02.54.383,W006.10.59.722
-	N033.58.31.870,W006.11.24.668
-	N033.54.16.037,W006.12.38.890
-	N033.50.13.160,W006.14.40.561
-	N033.31.08.000,W008.28.29.000
-	N033.37.23.160,W008.27.58.477
-	N033.43.29.752,W008.26.13.104
-	N033.49.18.465,W008.23.20.364
-	N033.54.40.640,W008.19.24.506
-	N033.59.28.250,W008.14.31.336
-	N034.03.34.106,W008.08.48.067
-	N034.06.52.048,W008.02.23.149
-	N034.09.17.104,W007.55.26.060
-	N034.10.45.626,W007.48.07.073
-	N034.11.14.000,W007.44.18.000
-	N034.19.50.000,W007.22.54.000
-	N034.36.02.000,W007.00.54.000
-	N034.11.47.000,W006.12.45.000
-	N032.45.37.000,W008.24.46.000
-	N033.31.08.000,W008.28.29.000
+	N34.1872222, W007.7383333
+	N34.6005556, W007.0150000
+	N34.4972222, W006.3316667
+	N33.7339306, W06.3332194
+	N033.08.09.059,W006.50.59.179
+	N032.37.10.628,W007.21.58.780
+	N032.38.18.700,W007.30.11.091
+	N32.7192667, W008.1002222
+	N32.7273750, W008.1614444
+	N33.5188889, W008.4747222
+	N33.9938889, W008.2422222
 beacons =
 	LAKAM,N34.1872222, W007.7383333,0, LAKAM
 	TUSOR,N34.4972222, W006.3316667,0, Tow-sur
@@ -122,45 +100,9 @@ airlines =
 	AFR,	2,	A319/A320,	Air France,	ne
 	RAM,	1,	B737/B738/B789/B788/E190,	Royal air maroc,	nswe
 
-[area1]
-shape = polygon
-altitude = 2000
-points =
-	N032.39.16.000,W007.09.32.000
-	N032.37.10.000,W007.21.58.000
-	N032.45.37.000,W008.24.46.000
-	N032.39.16.000,W007.09.32.000
-	N033.03.51.000,W007.03.54.000
-	N033.31.21.000,W006.35.54.000
-	N033.42.38.000,W006.21.38.000
-	N033.43.09.568,W006.20.53.182
-	N033.46.29.181,W006.17.26.689
-	N033.50.13.160,W006.14.40.561
-	N034.11.47.000,W006.12.45.000
-	N034.11.33.610,W006.12.38.890
-	N034.07.17.122,W006.11.24.668
-	N034.02.54.383,W006.10.59.722
-	N033.58.31.870,W006.11.24.668
-	N033.54.16.037,W006.12.38.890
-	N033.50.13.160,W006.14.40.561
-	N033.31.08.000,W008.28.29.000
-	N033.37.23.160,W008.27.58.477
-	N033.43.29.752,W008.26.13.104
-	N033.49.18.465,W008.23.20.364
-	N033.54.40.640,W008.19.24.506
-	N033.59.28.250,W008.14.31.336
-	N034.03.34.106,W008.08.48.067
-	N034.06.52.048,W008.02.23.149
-	N034.09.17.104,W007.55.26.060
-	N034.10.45.626,W007.48.07.073
-	N034.11.14.000,W007.44.18.000
-	N034.19.50.000,W007.22.54.000
-	N034.36.02.000,W007.00.54.000
-	N034.11.47.000,W006.12.45.000
-	N032.45.37.000,W008.24.46.000
-	N033.31.08.000,W008.28.29.000
 
-[area2]
+
+[area1]
 shape = polygon
 altitude = 2000
 points =
@@ -204,7 +146,7 @@ points =
 	N033.27.22.000,W007.22.52.000
 	N033.30.41.975,W007.31.14.675
 	N033.36.35.854,W007.35.21.947
-[area3]
+[area2]
 shape = polygon
 altitude = 2000
 points =
diff --git a/final/AF/MAR/GMMX.txt b/final/AF/MAR/GMMX.txt
new file mode 100644
index 0000000..74ce736
--- /dev/null
+++ b/final/AF/MAR/GMMX.txt
@@ -0,0 +1,40 @@
+
+[airspace]
+elevation = 1545
+center = N31.6068992615, W8.03629970551
+magneticvar = -3.246
+beacons =
+	MAK, N31.61280, W8.10306, 0, Marrakech
+	CNZ, N31.60060, W7.96444, 0, Marrakech
+boundary =
+	N032.05.02.750,W008.05.29.340
+	N032.08.04.300,W008.07.19.750
+	N032.05.02.750,W008.05.29.340
+	N031.52.02.910,W007.57.40.490
+	N031.50.15.530,W007.48.51.290
+	N031.48.30.860,W007.40.18.960
+	N031.50.15.530,W007.48.51.290
+	N031.48.30.860,W007.40.18.960
+	N031.46.20.620,W007.29.45.910
+	N031.26.04.800,W007.29.16.680
+	N031.17.01.020,W007.41.14.310
+	N031.17.01.020,W007.41.14.310
+	N031.10.18.240,W008.25.05.010
+	N031.29.57.280,W008.46.16.820
+	N032.08.04.300,W008.07.19.750
+	N032.05.18.290,W008.30.02.800
+	N032.03.05.211,W008.33.13.581
+	N031.59.09.565,W008.37.44.253
+	N031.54.40.801,W008.41.27.747
+	N031.49.45.607,W008.44.18.621
+	N031.44.31.312,W008.46.12.778
+	N031.39.05.697,W008.47.07.557
+	N031.33.36.800,W008.47.01.779
+	N031.29.57.280,W008.46.16.820
+
+
+[airport1]
+name = Menara Airport
+code = GMMX
+runways =
+	rwy1, 10, N31.6084, W8.05254, 96.0, 10170, 918, 0, 1506