diff --git a/Boundaries.geojson b/Boundaries.geojson
index a32bed17..d476c1fe 100644
--- a/Boundaries.geojson
+++ b/Boundaries.geojson
@@ -172,8 +172,18 @@
   { "type": "Feature", "properties": { "id": "GCCC-RW3", "oceanic": "0", "label_lon": "-18.86", "label_lat": "29.39", "region": "EMEA", "division": "VATEUD" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [-13.993381183419649, 30.7044366443462], [-14.047772141296772, 30.730025361735166], [-15.744333, 31.484585], [-16.047423, 31.423573], [-16.358333, 31.403175], [-16.669244, 31.423573], [-16.972498, 31.484585], [-17.26063, 31.584601], [-17.416667, 31.65], [-20, 30], [-20.391944, 29.999444], [-20.393333, 28.45], [-20.000556, 28.257778], [-19.671111, 28.059167], [-19.664444, 27.485833], [-16.299620604969608, 27.500321523802782], [-15.513499953379505, 28.160499816895022], [-15.378500182947596, 28.160499706533102], [-15.164839653094038, 28.653300154314017], [-13.993381183419649, 30.7044366443462] ] ] ] } },
   { "type": "Feature", "properties": { "id": "GCCO", "oceanic": "1", "label_lon": "-21.0", "label_lat": "24.942397", "region": "EMEA", "division": "VATEUD" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [[[-25,30],[-20.391944,29.999444],[-20.393333,28.45],[-20.000556,28.257778],[-19.671111,28.059167],[-19.664444,27.485833],[-19.668611,27],[-18.006667,25.002778],[-15.541180615693657,25.00086111994966],[-13.781833300013947,27.265899562056127],[-13.001957992848666,28.247993012616895],[-13.166667,27.666667],[-10.766667,27.666667],[-8.666667,27.666667],[-8.666615,27.333301],[-8.666408,25.998608],[-12,26],[-11.9998,23.998739],[-12,23.5],[-11.9998,23.448775],[-12.749814,23.390447],[-12.858147,23.332117],[-13,23.166667],[-13.083153,22.998808],[-13.145653,22.748825],[-13.124819,22.498842],[-13.066486,21.998875],[-13.016486,21.498911],[-12.999819,21.332256],[-14,21.333333],[-15.083333,21.333333],[-16.91655,21.332261],[-17.066553,20.7823],[-18.999919,18.9991],[-19.999936,19.999025],[-25,24],[-25,30]]] ] } },
   { "type": "Feature", "properties": { "id": "GLRB", "oceanic": "0", "label_lon": "-12.124819", "label_lat": "6.337707", "region": "EMEA", "division": "VATSSA" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ -16.916556, 8.99995 ], [ -15.083194, 10.883111 ], [ -14.649853, 11.499725 ], [ -14.266514, 11.666375 ], [ -13.716506, 11.699706 ], [ -13.699839, 11.999678 ], [ -13.966508, 12.199661 ], [ -13.649839, 12.316317 ], [ -13.708172, 12.674619 ], [ -13.083161, 12.649622 ], [ -13.066494, 12.499633 ], [ -12.883158, 12.549631 ], [ -12.366483, 12.316317 ], [ -11.899811, 12.449639 ], [ -11.383136, 12.416308 ], [ -11.483139, 12.199661 ], [ -11.233133, 11.999678 ], [ -11.049797, 12.232989 ], [ -10.899794, 12.216325 ], [ -10.666458, 11.899686 ], [ -10.449789, 12.132997 ], [ -10.333119, 12.232989 ], [ -9.716444, 12.024675 ], [ -9.633108, 12.166328 ], [ -9.416439, 12.266319 ], [ -9.349772, 12.241322 ], [ -9.299769, 12.357978 ], [ -9.416439, 12.4663 ], [ -9.292825, 12.499631 ], [ -7.999753, 11.208633 ], [ -7.999753, 10.166506 ], [ -8.416428, 7.500086 ], [ -7.449747, 6.250203 ], [ -7.333081, 0.000794 ], [ -16.916556, 8.99995 ] ] ] ] } },
-  { "type": "Feature", "properties": { "id": "GMAC", "oceanic": "0", "label_lon": "-12.0", "label_lat": "33.0", "region": "EMEA", "division": "VATEUD" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ -12.0, 35.966667 ], [ -7.383333, 35.966667 ], [ -7.383333, 35.833333 ], [ -6.802778, 35.833333 ], [ -9.728889, 32.961389 ], [ -12.5, 30.0 ], [ -14.047778, 30.73 ], [ -15.744333, 31.484585 ], [ -15.470826, 31.581448 ], [ -15.207576, 31.716083 ], [ -14.971418, 31.883198 ], [ -14.768085, 32.079516 ], [ -14.616667, 32.25 ], [ -12.0, 35.966667 ] ] ] ] } },
-  { "type": "Feature", "properties": { "id": "GMMM", "oceanic": "0", "label_lon": "-8.390876", "label_lat": "31.814217", "region": "EMEA", "division": "VATMENA" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ -12.5, 30.0 ], [ -14.047778, 30.73 ], [ -15.744333, 31.484585 ], [ -15.470826, 31.581448 ], [ -15.207576, 31.716083 ], [ -14.971418, 31.883198 ], [ -14.768085, 32.079516 ], [ -14.616667, 32.25 ], [ -12.0, 35.966667 ], [ -7.383333, 35.966667 ], [ -7.383333, 35.833333 ], [ -6.802778, 35.833333 ], [ -6.802778, 35.833333 ], [ -2.1, 35.833333 ], [ -2.2, 35.083333 ], [ -2.216667, 35.033333 ], [ -1.783333, 34.75 ], [ -1.866667, 34.616667 ], [ -1.716667, 34.483333 ], [ -1.8, 34.4 ], [ -1.683333, 34.1 ], [ -1.75, 33.683333 ], [ -1.633333, 33.6 ], [ -1.7, 33.266667 ], [ -1.5, 33.05 ], [ -1.5, 33.0 ], [ -1.583333, 32.966667 ], [ -1.4, 32.716667 ], [ -1.033333, 32.516667 ], [ -1.216667, 32.4 ], [ -1.266667, 32.3 ], [ -1.266667, 32.216667 ], [ -1.216667, 32.15 ], [ -1.25, 32.116667 ], [ -1.433333, 32.15 ], [ -2.316667, 32.2 ], [ -2.833333, 32.133333 ], [ -2.933333, 32.083333 ], [ -2.966667, 32.0 ], [ -2.666667, 31.833333 ], [ -8.666667, 28.666667 ], [ -8.666667, 27.666667 ], [ -13.166667, 27.666667 ], [ -12.5, 30.0 ] ] ] ] } },
+  { "type": "Feature", "properties": { "id": "GMMM-ALL", "oceanic": "0", "label_lon": "-8.07", "label_lat": "32.57", "region": "EMEA", "division": "VATMENA" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ -12.5, 30.0 ], [ -14.047778, 30.73 ], [ -15.744333, 31.484585 ], [ -15.470826, 31.581448 ], [ -15.207576, 31.716083 ], [ -14.971418, 31.883198 ], [ -14.768085, 32.079516 ], [ -14.616667, 32.25 ], [ -12.0, 35.966667 ], [ -7.383333, 35.966667 ], [ -7.383333, 35.833333 ], [ -6.802778, 35.833333 ], [ -6.802778, 35.833333 ], [ -2.1, 35.833333 ], [ -2.2, 35.083333 ], [ -2.216667, 35.033333 ], [ -1.783333, 34.75 ], [ -1.866667, 34.616667 ], [ -1.716667, 34.483333 ], [ -1.8, 34.4 ], [ -1.683333, 34.1 ], [ -1.75, 33.683333 ], [ -1.633333, 33.6 ], [ -1.7, 33.266667 ], [ -1.5, 33.05 ], [ -1.5, 33.0 ], [ -1.583333, 32.966667 ], [ -1.4, 32.716667 ], [ -1.033333, 32.516667 ], [ -1.216667, 32.4 ], [ -1.266667, 32.3 ], [ -1.266667, 32.216667 ], [ -1.216667, 32.15 ], [ -1.25, 32.116667 ], [ -1.433333, 32.15 ], [ -2.316667, 32.2 ], [ -2.833333, 32.133333 ], [ -2.933333, 32.083333 ], [ -2.966667, 32.0 ], [ -2.666667, 31.833333 ], [ -8.666667, 28.666667 ], [ -8.666667, 27.666667 ], [ -13.166667, 27.666667 ], [ -12.5, 30.0 ] ] ] ] } },
+  { "type": "Feature", "properties": { "id": "GMAC", "oceanic": "0", "label_lon": "-12.0", "label_lat": "33.0", "region": "EMEA", "division": "VATMENA" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ -15.744332925956826, 31.48458511510887 ], [ -15.470825207532698, 31.581448196082917 ], [ -15.207576762410156, 31.71608249004153 ], [ -14.971418096665161, 31.883197795650588 ], [ -14.766032931095822, 32.08102352182746 ], [ -14.616661628137962, 32.25000709664769 ], [ -12.000000132157737, 35.96666707762215 ], [ -7.383333154158066, 35.96666704727251 ], [ -7.383333086181608, 35.83333301616662 ], [ -6.450826294805438, 35.8333289255704 ], [ -9.441234754311807, 33.311817841193886 ], [ -9.456939138146964, 33.05880099107735 ], [ -9.730760934656558, 32.959894058359765 ], [ -12.500000337317601, 30.000000589995125 ], [ -13.872162432002426, 30.64666040368185], [ -14.627438804883866, 30.989921942486205 ], [ -15.744332686167553, 31.48458520500047 ] ] ] ] } },
+  { "type": "Feature", "properties": { "id": "GMAC-O", "oceanic": "0", "label_lon": "-12.5", "label_lat": "33.7", "region": "EMEA", "division": "VATMENA" }, "geometry": { "type": "MultiPolygon", "coordinates":[ [ [ [ -15.744332590303713, 31.484585413250727 ], [ -15.470824737963738, 31.581448369510966 ], [ -15.207574925797616, 31.716083263838755 ], [ -14.971418335813155, 31.8831977038827 ], [ -14.766038522441193, 32.08101800119415 ], [ -14.616660739502635, 32.250007914202186 ], [ -12.000000011895196, 35.96666714082804 ], [ -9.629340548200446, 35.96666711731291 ], [ -11.538400507300565, 33.19121294787344 ], [ -12.436393270647756, 32.738371862381186 ], [ -14.04977407110374, 30.727486488459746 ], [ -14.69189295051541, 31.01853922326815 ], [ -15.744332251847936, 31.484585464541198 ] ] ] ] } },
+  { "type": "Feature", "properties": { "id": "GMAC-ON", "oceanic": "0", "label_lon": "-11.9", "label_lat": "34.5", "region": "EMEA", "division": "VATMENA" }, "geometry": { "type": "MultiPolygon", "coordinates":[ [ [ [ -13.967797869679828, 33.186806761185935 ], [ -11.999999969869748, 35.966667148405065 ], [ -9.629340506946704, 35.966667024083264 ], [ -11.538400284507901, 33.1912131091438 ], [ -12.43447500263332, 32.739341683690085 ], [ -13.967797766888594, 33.18680681909147 ] ] ] ] } },
+  { "type": "Feature", "properties": { "id": "GMAC-OS", "oceanic": "0", "label_lon": "-14.0", "label_lat": "32.0", "region": "EMEA", "division": "VATMENA" }, "geometry": { "type": "MultiPolygon", "coordinates":[ [ [ [ -15.744332500520414, 31.484585582256827 ], [ -15.470824297340982, 31.581448356720088 ], [ -15.207575159235262, 31.7160830426494 ], [ -14.97141817802941, 31.883197642586012 ], [ -14.766040423736541, 32.08101606946569 ], [ -14.61666076118027, 32.25000780737096 ], [ -13.967797822235724, 33.18680697896728 ], [ -12.434475398299384, 32.739341717975165 ], [ -12.436393299972138, 32.73837198823459 ], [ -14.049774182093188, 30.72748641124626 ], [ -14.356941356755783, 30.866826191441177 ], [ -14.364453221495523, 30.870231216874785 ], [ -15.196905795909913, 31.242458446981146 ], [ -15.74433229488048, 31.484585528748426 ] ] ] ] } },
+  { "type": "Feature", "properties": { "id": "GMAC-W", "oceanic": "0", "label_lon": "-10.5", "label_lat": "33.4", "region": "EMEA", "division": "VATMENA" }, "geometry": { "type": "MultiPolygon", "coordinates":[ [ [ [ -14.04977408108769, 30.727486442851387 ], [ -12.500000521026408, 30.000000797889427 ], [ -9.730761121221065, 32.959894081380696 ], [ -9.456938969220658, 33.05880101141216 ], [ -9.441234816881348, 33.31181830921895 ], [ -6.450826901702186, 35.83333260417956 ], [ -7.3833332135949945, 35.83333321881622 ], [ -7.383333329966888, 35.966667070712305 ], [ -9.629340741134058, 35.9666670475379 ], [ -11.538400489118516, 33.191212702170986 ], [ -12.43639337612052, 32.738371603666096 ], [ -14.049773931363774, 30.727486673630594 ] ] ] ] } },  { "type": "Feature", "properties": { "id": "GMAC-WN", "oceanic": "0", "label_lon": "-9.3", "label_lat": "34.6", "region": "EMEA", "division": "VATMENA" }, "geometry": { "type": "MultiPolygon", "coordinates":[ [ [ [ -9.730761205081564, 32.95989418792789 ], [ -11.538400534783278, 33.19121251609354 ], [ -9.629340676579204, 35.9666668767473 ], [ -7.383333208208683, 35.96666706731146 ], [ -7.383333108462011, 35.83333324568122 ], [ -6.450826490809959, 35.833332831164114 ], [ -9.44123457374178, 33.31181853495772 ], [ -9.456938795509842, 33.05880091516089 ], [ -9.730760947404576, 32.959894227202895 ] ] ] ] } },
+  { "type": "Feature", "properties": { "id": "GMAC-WS", "oceanic": "0", "label_lon": "-12.14", "label_lat": "31.7", "region": "EMEA", "division": "VATMENA" }, "geometry": { "type": "MultiPolygon", "coordinates":[ [ [ [ -11.53840073768609, 33.191212358831095 ], [ -9.730752649156841, 32.95989124609471 ], [ -12.50000047978034, 30.0000008372661 ], [ -14.0497739875415, 30.72748630006646 ], [ -12.436393289826725, 32.738371666330124 ], [ -11.538400570557513, 33.191212583968294 ] ] ] ] } },
+  { "type": "Feature", "properties": { "id": "GMMM", "oceanic": "0", "label_lon": "-7.44", "label_lat": "32.28", "region": "EMEA", "division": "VATMENA" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ -13.166666929858508, 27.66666689826353 ], [ -12.49999986088983, 30.00000072342995 ], [ -9.730760758763608, 32.95989440927838 ], [ -9.456910831310978, 33.05881467025648 ], [ -9.441234819687224, 33.31181838044334 ], [ -6.45082563950578, 35.83333321223499 ], [ -2.099999937395637, 35.83333287266058 ], [ -2.2000024367392825, 35.08331378889788 ], [ -2.2166674760647993, 35.03333285398351 ], [ -1.7833332988004997, 34.75000019860266 ], [ -1.8666668070768537, 34.61666757607739 ], [ -1.7166671123561343, 34.483332985556004 ], [ -1.7999997384449955, 34.40000025034347 ], [ -1.683337192230141, 34.100010724323624 ], [ -1.7499999923588803, 33.683332452299666 ], [ -1.6333207341039895, 33.59998720543045 ], [ -1.7000001976860517, 33.266667032828025 ], [ -1.5000002391884095, 33.0499997469508 ], [ -1.5000000516835712, 32.99999947059251 ], [ -1.5833334190973005, 32.966666733801446 ], [ -1.4000005925260837, 32.71666696070331 ], [ -1.033332764992565, 32.516666497212384 ], [ -1.2166670164236564, 32.400000174970344 ], [ -1.266672430402366, 32.299994590044065 ], [ -1.2666671334667967, 32.21666669288231 ], [ -1.2166670993658215, 32.14999998748178 ], [ -1.2500001891984027, 32.116666968162605 ], [ -1.4333337599935305, 32.15000017426232 ], [ -2.3166684151446475, 32.20000012754093 ], [ -2.833333614707044, 32.133333060889 ], [ -2.933333719752852, 32.08333306632305 ], [ -2.9666671359804297, 31.99999949166687 ], [ -2.6666676445121027, 31.833333080614068 ], [ -8.666666964502951, 28.66666740021283 ], [ -8.666666693016026, 27.666667087080015 ], [ -13.166667003238985, 27.66666700774435 ] ] ] ] } },
+  { "type": "Feature", "properties": { "id": "GMMM-NE", "oceanic": "0", "label_lon": "-5.0", "label_lat": "34.1", "region": "EMEA", "division": "VATMENA" }, "geometry": { "type": "MultiPolygon", "coordinates":[ [ [ [ -6.4508259272223825, 35.833333209447545 ], [ -2.10000010138765, 35.833332804331704 ], [ -2.200002000799003, 35.0833209809836 ], [ -2.2166675759463317, 35.03333280492002 ], [ -1.783333253224015, 34.75000002304432 ], [ -1.866667089974868, 34.61666738312195 ], [ -1.7166676704904376, 34.48333343455106 ], [ -1.8000002588510426, 34.39999976954482 ], [ -1.6833327851003617, 34.09999982083767 ], [ -1.7500001279748574, 33.68333239304759 ], [ -1.6333205734883052, 33.59998719665293 ], [ -1.7000002419368059, 33.266667034191514 ], [ -1.5000003164706186, 33.04999971250129 ], [ -1.5000001036742674, 32.99999941061053 ], [ -1.5833335236673634, 32.96666686630603 ], [ -1.400000491797016, 32.71666656779976 ], [ -1.0333329014594028, 32.51666670285809 ], [ -1.2166671924123875, 32.40000006703502 ], [ -1.26666738768904, 32.29999979816289 ], [ -1.2666671754995775, 32.21666671546852 ], [ -1.2166672046842848, 32.149999890699846 ], [ -1.2500000712419705, 32.11666691427378 ], [ -1.433334244885259, 32.15000032652641 ], [ -2.316667669047405, 32.20000023142457 ], [ -2.833333134101167, 32.13333314063976 ], [ -2.9333334512171803, 32.08333319283537 ], [ -2.96666704100204, 31.999999590204027 ], [ -2.6666674078439314, 31.833332760381666 ], [ -3.586317236106794, 31.35463606062673 ], [ -6.935277993369567, 33.00333298248273 ], [ -7.159166942071295, 32.654722389599215 ], [ -7.366389043733449, 32.61972212495998 ], [ -8.412777932084111, 32.760000086243664 ], [ -9.174166907657735, 33.16083300161981 ], [ -9.456910765628294, 33.05881481188044 ], [ -9.441234690981702, 33.311818404062635 ], [ -6.450825415520512, 35.83333343384017 ] ] ] ] } },
+  { "type": "Feature", "properties": { "id": "GMMM-N", "oceanic": "0", "label_lon": "-7.1", "label_lat": "34.4", "region": "EMEA", "division": "VATMENA" }, "geometry": { "type": "MultiPolygon", "coordinates":[ [ [ [ -9.44123482400289, 33.31181852293439 ], [ -6.450825734545873, 35.83333322085902 ], [ -4.911111591843564, 35.833333089114674 ], [ -6.21361116866828, 34.199166873480635 ], [ -6.360833126271757, 33.71083226004566 ], [ -6.598889302396486, 33.52249957293108 ], [ -7.159166706507932, 32.654722510472 ], [ -7.366389242504596, 32.6197221572196 ], [ -8.412778122767804, 32.75999997997302 ], [ -9.174166680351561, 33.16083299144688 ], [ -9.456910584919797, 33.05881484758227 ], [ -9.441234760475368, 33.311818564304986 ] ] ] ] } },
+  { "type": "Feature", "properties": { "id": "GMMM-E", "oceanic": "0", "label_lon": "-3.2", "label_lat": "33.7", "region": "EMEA", "division": "VATMENA" }, "geometry": { "type": "MultiPolygon", "coordinates":[ [ [ [ -6.935278130310252, 33.00333286356286 ], [ -6.5988889364322745, 33.52249982538359 ], [ -6.360833027117167, 33.710832626157355 ], [ -6.213611025066825, 34.19916678970348 ], [ -4.911115038018266, 35.83332756419347 ], [ -2.099999992208069, 35.83333278999221 ], [ -2.200001871387144, 35.08331251103918 ], [ -2.2166677752908583, 35.03333255601618 ], [ -1.783333193030387, 34.74999991371155 ], [ -1.8666672385941183, 34.61666722627834 ], [ -1.7166675975291525, 34.483333406582275 ], [ -1.8000002936757653, 34.399999788453826 ], [ -1.6833327920223269, 34.099999480747286 ], [ -1.750000161631931, 33.68333208582982 ], [ -1.6333207307913824, 33.599987383114836 ], [ -1.7000001827127846, 33.26666717376244 ], [ -1.5000004102732873, 33.049999755160144 ], [ -1.5000001598627364, 32.99999902752674 ], [ -1.58333304310446, 32.96666690949843 ], [ -1.4000004052375061, 32.716666347653984 ], [ -1.0333329502885817, 32.51666664648009 ], [ -1.2166676624609352, 32.39999976327988 ], [ -1.266667405098957, 32.2999998845992 ], [ -1.2666670965282094, 32.21666640719711 ], [ -1.2166673046370704, 32.14999969428652 ], [ -1.2500000538503855, 32.11666688566123 ], [ -1.4333341606163117, 32.15000037542106 ], [ -2.316667432599246, 32.20000017316319 ], [ -2.8333328386704295, 32.13333310305056 ], [ -2.9333336931263716, 32.08333321938855 ], [ -2.9666669336748157, 31.999999502009857 ], [ -2.6666675184517885, 31.833332771144953 ], [ -3.5863172860990176, 31.35463599638007 ], [ -6.9352777585313845, 33.0033328417248] ] ] ] } },
+  { "type": "Feature", "properties": { "id": "GMMM-S", "oceanic": "0", "label_lon": "-8.3", "label_lat": "31.4", "region": "EMEA", "division": "VATMENA" }, "geometry": { "type": "MultiPolygon", "coordinates":[ [ [ [ -3.5865562274556453, 31.3547763208406 ], [ -8.666666816947497, 28.66666739797583 ], [ -8.666666882119642, 27.666666926601565 ], [ -13.166666858576633, 27.666667132564797 ], [ -12.4999999287013, 30.000000671459176 ], [ -9.730760783898006, 32.95989397666038 ], [ -9.174167030401577, 33.16083263678789 ], [ -8.412778051414847, 32.76000002739734 ], [ -7.366388608455793, 32.61972214655373 ], [ -7.159167014888084, 32.65472216513176 ], [ -6.934877308062454, 33.003137230017586 ], [ -3.5865563198248367, 31.354776350745652 ] ] ] ] } },
   { "type": "Feature", "properties": { "id": "GOOC", "oceanic": "0", "label_lon": "-20.249722", "label_lat": "2.500555", "region": "EMEA", "division": "VATSSA" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ -37.5, 16.999167 ], [ -21.366389, 12.966111 ], [ -16.916556, 8.99995 ], [ -7.333081, 0.000794 ], [ -2.999444, -1.848889 ], [ -3.0, -9.533333 ], [ -10.0, -12.0 ], [ -9.999722, -6.365 ], [ -16.0, -6.366667 ], [ -35.0, 7.666667 ], [ -37.5, 13.5 ], [ -37.5, 16.999167 ] ] ] ] } },
   { "type": "Feature", "properties": { "id": "GOOO", "oceanic": "0", "label_lon": "-11.933149", "label_lat": "16.0", "region": "EMEA", "division": "VATSSA" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ -8.666615, 27.333301 ], [ -3.582997, 24.165381 ], [ -3.599681, 16.349297 ], [ -4.066356, 14.516117 ], [ -4.283028, 12.866261 ], [ -4.799703, 11.999672 ], [ -5.249711, 11.499717 ], [ -5.533333, 10.366667 ], [ -5.616383, 10.033183 ], [ -7.999753, 10.166506 ], [ -7.999753, 11.208633 ], [ -9.292825, 12.499631 ], [ -9.416439, 12.4663 ], [ -9.299769, 12.357978 ], [ -9.349772, 12.241322 ], [ -9.416439, 12.266319 ], [ -9.633108, 12.166328 ], [ -9.716444, 12.024675 ], [ -10.333119, 12.232989 ], [ -10.449789, 12.132997 ], [ -10.666458, 11.899686 ], [ -10.899794, 12.216325 ], [ -11.049797, 12.232989 ], [ -11.233133, 11.999678 ], [ -11.483139, 12.199661 ], [ -11.383136, 12.416308 ], [ -11.899811, 12.449639 ], [ -12.366483, 12.316317 ], [ -12.883158, 12.549631 ], [ -13.066494, 12.499633 ], [ -13.083161, 12.649622 ], [ -13.708172, 12.674619 ], [ -13.649839, 12.316317 ], [ -13.966508, 12.199661 ], [ -13.699839, 11.999678 ], [ -13.716506, 11.699706 ], [ -14.266514, 11.666375 ], [ -14.649853, 11.499725 ], [ -15.083194, 10.883111 ], [ -16.916556, 8.99995 ], [ -21.366389, 12.966111 ], [ -19.999936, 14.999422 ], [ -19.999936, 19.999025 ], [ -18.999919, 18.9991 ], [ -17.066553, 20.7823 ], [ -16.91655, 21.332261 ], [ -15.083333, 21.333333 ], [ -14.0, 21.333333 ], [ -12.999819, 21.332256 ], [ -13.016486, 21.498911 ], [ -13.066486, 21.998875 ], [ -13.124819, 22.498842 ], [ -13.145653, 22.748825 ], [ -13.083153, 22.998808 ], [ -12.999817, 23.165464 ], [ -12.858147, 23.332117 ], [ -12.749814, 23.390447 ], [ -11.9998, 23.448775 ], [ -12.0, 23.5 ], [ -11.9998, 23.998739 ], [ -11.999797, 25.998614 ], [ -8.666408, 25.998608 ], [ -8.666615, 27.333301 ] ] ] ] } },
   { "type": "Feature", "properties": { "id": "GVSC", "oceanic": "0", "label_lon": "-28.751528", "label_lat": "18.481667", "region": "EMEA", "division": "VATSSA" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ -25.0, 24.0 ], [ -19.999936, 19.999025 ], [ -19.999936, 14.999422 ], [ -21.366389, 12.966111 ], [ -37.5, 16.999167 ], [ -25.0, 24.0 ] ] ] ] } },
diff --git a/VATSpy.dat b/VATSpy.dat
index e6cccc18..410726e1 100644
--- a/VATSpy.dat
+++ b/VATSpy.dat
@@ -18457,7 +18457,18 @@ GCCC-RW3|Canarias (North West Sector) - Canarias|GCCC_RW3|GCCC-RW3
 GCCO|Canarias Oceanic||GCCO
 GLRB|Roberts||GLRB
 GMAC|Agadir||GMAC
+GMAC_O|Agadir Oceanic|GMAC_O|GMAC-O
+GMAC-ON|Agadir Oceanic North|GMAC_ON|GMAC-ON
+GMAC-OS|Agadir Oceanic South|GMAC_OS|GMAC-OS
+GMAC-W|Agadir West|GMAC_W|GMAC-W
+GMAC-WS|Agadir Oceanic South West|GMAC_WS|GMAC-WS
+GMAC-WN|Agadir North West|GMAC_WN|GMAC-WN
+GMMM|Casablanca|GMMM_ALL|GMMM-ALL
 GMMM|Casablanca||GMMM
+GMMM-S|Casablanca South|GMMM_S|GMMM-S
+GMMM-N|Casablanca North|GMMM_N|GMMM-N
+GMMM-E|Casablanca East|GMMM_E|GMMM-E
+GMMM-NE|Casablanca North East|GMMM_NE|GMMM-NE
 GOOC|Dakar Oceanic||GOOC
 GOOO|Dakar||GOOO
 GVSC|Sal Oceanic||GVSC