diff --git a/Maps/ASMGCS_TAXI_ALL.xml b/Maps/ASMGCS_TAXI_ALL.xml
index 3071944f..709b873b 100644
--- a/Maps/ASMGCS_TAXI_ALL.xml
+++ b/Maps/ASMGCS_TAXI_ALL.xml
@@ -341,24 +341,39 @@
-2636.0879+15305.131
-2636.2143+15305.2924
-2636.1784+15305.3226
- -1915.3434+14646.0233
- -1914.7885+14646.3943
- -1915.3851+14645.4993
- -1915.0108+14646.1791
- -1915.2838+14646.1253
- -1915.1801+14646.0712
- -1915.1488+14645.9533
- -1914.8383+14646.2621
- -1914.7721+14645.953
- -1915.1608+14646.1797
- -1914.6499+14646.3602
- -1914.4736+14646.1733
- -1915.4618+14646.0541
- -1915.4244+14646.1147
- -1915.5073+14645.7239
- -1914.5757+14645.9445
- -1914.3484+14646.0611
- -1914.2451+14646.3113
+ -1915.5135+14645.9441
+ -1915.4047+14646.0236
+ -1915.2989+14646.0818
+ -1915.1636+14646.1568
+ -1914.9667+14646.2654
+ -1914.7819+14646.3672
+ -1914.5041+14646.5074
+ -1915.3948+14645.3991
+ -1915.407+14645.522
+ -1915.4251+14645.7017
+ -1915.0269+14646.173
+ -1915.2547+14646.1559
+ -1915.2116+14646.0732
+ -1915.1777+14645.9579
+ -1914.8534+14646.2607
+ -1914.778+14646.0835
+ -1915.1394+14646.2083
+ -1914.6176+14646.368
+ -1914.5182+14646.21
+ -1915.4219+14646.0639
+ -1915.3856+14646.1046
+ -1915.4887+14645.7585
+ -1914.5136+14645.7149
+ -1914.6737+14645.959
+ -1914.5971+14645.9492
+ -1914.4875+14646.0353
+ -1914.4206+14646.0666
+ -1914.3779+14646.0994
+ -1914.2674+14646.307
+ -1914.2895+14646.1994
+ -1915.3489+14646.2817
+ -1915.4912+14645.5083
+ -1915.5798+14645.9904
-3019.963+15306.6594
-3019.8605+15306.765
-3019.4967+15307.1133
diff --git a/Maps/FIR_BOUNDARIES.xml b/Maps/FIR_BOUNDARIES.xml
index 369557d8..07fdd405 100644
--- a/Maps/FIR_BOUNDARIES.xml
+++ b/Maps/FIR_BOUNDARIES.xml
@@ -283,6 +283,46 @@
-900000.000-1310000.000/
-900000.000+1630000.000
+
+ -45.503612+165.811942/
+ -45.916665+165.300000/
+ -45.000000+163.000000/
+ -30.000000+163.000000/
+ -34.251980+172.499500/
+ -34.285766+172.358316/
+ -34.614337+171.860672/
+ -35.000705+171.435993/
+ -35.436120+171.094595/
+ -35.910590+170.844718/
+ -36.413055+170.692361/
+ -36.931603+170.641168/
+ -37.453703+170.692361/
+ -37.966482+170.844718/
+ -38.457029+171.094595/
+ -38.912729+171.435993/
+ -39.127231+171.556106/
+ -39.325734+171.223974/
+ -39.759432+170.860921/
+ -40.232471+170.595217/
+ -40.733933+170.433221/
+ -41.252010+170.378791/
+ -41.424168+170.390000/
+ -41.566667+170.243057/
+ -42.821388+168.913304/
+ -42.819016+168.782720/
+ -42.844720+168.303280/
+ -42.921263+167.835710/
+ -43.046945+167.391572/
+ -43.218963+166.981829/
+ -43.433455+166.616564/
+ -43.685562+166.304736/
+ -43.969516+166.053968/
+ -44.278735+165.870368/
+ -44.605951+165.758398/
+ -44.943353+165.720771/
+ -45.282749+165.758398/
+ -45.503612+165.811942
+
-140813.000+1150832.000/
-120000.000+1143000.000/
diff --git a/Maps/Oakey/OK_TCU.xml b/Maps/Oakey/OK_TCU.xml
index 08270d4f..cd7ed7d3 100644
--- a/Maps/Oakey/OK_TCU.xml
+++ b/Maps/Oakey/OK_TCU.xml
@@ -94,6 +94,9 @@
MUPIK/
COLLY
+
+ NUTPA
+