diff --git a/.github/changelogs/2023.md b/.github/changelogs/2023.md
index dbbd1b8..8af26f4 100644
--- a/.github/changelogs/2023.md
+++ b/.github/changelogs/2023.md
@@ -117,8 +117,6 @@ Not released due to a lack of applicable changes.
 Not released due to lack of applicable changes.
 
 
-# Latest
-
 ## AIRAC 2306
 
 ### Revision A
@@ -158,4 +156,48 @@ The following Standard Routes have been updated or added: `AAPM5`, `HNPM5`, `NPP
 
 The following procedures have been added or amended:
   - `NZAA BOVRU 1B`: Had an `A` designator, instead of a `B` designator.
-  - `NZAP GUMAN 1B`: Was missing, and has been added.
\ No newline at end of file
+  - `NZAP GUMAN 1B`: Was missing, and has been added.
+
+
+# Latest
+
+## AIRAC 2308
+
+### Revision A
+
+#### ANR Updates
+
+  -  New Aerodrome added: `NZOI - Ongaio Island`
+  -  New Restricted Area added: `NZR404 - Mahia`
+
+**Auckland**
+
+  - The following procedures have been amended and resequenced: `REKIS 4Q`, `STEAL 2P`.
+    - **Changes:** Departure text amended to no longer allow a turn to fix before the end of the runway.
+
+**Queenstown**
+
+  - The procedures have been amended and resequenced: `VAPLI 2`. 
+    - **Changes:** Minor track changes to departure. `SUNGU` transition added.
+
+**Tauranga**
+
+  - Most STARs have been amended and resequenced by one. 
+    - **Changes:** Segment MSAs.
+  - `OLDON 2A`: WPT `BATAT` replaced by `MEZZO`.
+
+**Te Anau / Manapouri**
+
+  - The following procedures have been amended and resequenced: `GULAN 3`.
+    - **Changes:** `ENKUV` transition removed.
+
+**Standard Routes**
+
+  - The following Standard Routes have been amended: `AACH1` and `AACH6`.
+    - **Changes:** `AACH1` is now Jets only, with the `AACH6` now being props only.
+
+#### Dataset Updates
+
+The following errors have been fixed:
+  - `NZGB RNP B`: Added missing procedural waypoint: `GB678`.
+  - `NZHA RNP RWY 32`: Replaced `HA906` with 5LNC `OMUNU`.
\ No newline at end of file
diff --git a/Airspace.xml b/Airspace.xml
index 2606b41..d8864dd 100644
--- a/Airspace.xml
+++ b/Airspace.xml
@@ -14,7 +14,7 @@
         <SID Name="PAGL3Q" />
         <SID Name="POLI2Q" />
         <SID Name="RAXI2Q" />
-        <SID Name="REKI3Q" />
+        <SID Name="REKI4Q" />
         <SID Name="SATL3Q" />
         <STAR Name="ARAD7B" ApproachName="RNPZ" />
         <STAR Name="BASI9B" ApproachName="RNPZ" />
@@ -45,7 +45,7 @@
         <SID Name="MEMO2P" />
         <SID Name="NZAA4A" />
         <SID Name="OSRA1P" />
-        <SID Name="STEA1P" />
+        <SID Name="STEA2P" />
         <STAR Name="APAB3A" ApproachName="RNPZ" />
         <STAR Name="APAB3C" />
         <STAR Name="ARAD8A" ApproachName="RNPZ" />
@@ -422,18 +422,18 @@
     </Airport>
     <Airport Name="NZMO">
       <Runway Name="08" DataRunway="08">
-        <SID Name="GULAN2" />
+        <SID Name="GULAN3" />
       </Runway>
       <Runway Name="14" DataRunway="14">
-        <SID Name="GULAN2" />
+        <SID Name="GULAN3" />
       </Runway>
       <Runway Name="26" DataRunway="26">
-        <SID Name="GULAN2" />
+        <SID Name="GULAN3" />
         <STAR Name="ANGU1G" ApproachName="RNP" />
         <STAR Name="PEXE1G" ApproachName="RNP" />
       </Runway>
       <Runway Name="32" DataRunway="32">
-        <SID Name="GULAN2" />
+        <SID Name="GULAN3" />
       </Runway>
     </Airport>
     <Airport Name="NZMS">
@@ -711,7 +711,7 @@
         <SID Name="FKN8" Default="True" />
         <SID Name="IPNO4B" />
         <SID Name="REDO2B" Type="NonJet" />
-        <SID Name="VAPLI1" />
+        <SID Name="VAPLI2" />
         <STAR Name="ELRU4B" ApproachName="RNP-ARY" />
         <STAR Name="SUNG4B" ApproachName="RNP-ARY" />
         <STAR Name="UBDA4B" ApproachName="RNP-ARY" />
@@ -749,13 +749,13 @@
         <SID Name="BELET3" />
         <SID Name="TODA3P" />
         <SID Name="UBSE3P" />
-        <STAR Name="BIKO1A" ApproachName="RNP" />
+        <STAR Name="BIKO2A" ApproachName="RNP" />
         <STAR Name="FALS1A" ApproachName="RNP" />
-        <STAR Name="GOBU1A" ApproachName="RNP" />
-        <STAR Name="OLDO1A" ApproachName="RNP" />
-        <STAR Name="OROP1A" ApproachName="RNP" />
+        <STAR Name="GOBU2A" ApproachName="RNP" />
+        <STAR Name="OLDO2A" ApproachName="RNP" />
+        <STAR Name="OROP2A" ApproachName="RNP" />
         <STAR Name="PIBO1A" ApproachName="RNP" />
-        <STAR Name="URBU1A" ApproachName="RNP" />
+        <STAR Name="URBU2A" ApproachName="RNP" />
       </Runway>
       <Runway Name="16" DataRunway="16" />
       <Runway Name="22" DataRunway="22" />
@@ -763,13 +763,13 @@
         <SID Name="DOTAR3" />
         <SID Name="MORT3R" />
         <SID Name="RUST3R" />
-        <STAR Name="BIKO1B" ApproachName="RNP" />
+        <STAR Name="BIKO2B" ApproachName="RNP" />
         <STAR Name="FALS1B" ApproachName="RNP" />
         <STAR Name="GOBU1B" ApproachName="RNP" />
-        <STAR Name="OLDO1B" ApproachName="RNP" />
+        <STAR Name="OLDO2B" ApproachName="RNP" />
         <STAR Name="OROP1B" ApproachName="RNP" />
         <STAR Name="PIBO1B" ApproachName="RNP" />
-        <STAR Name="URBU1B" ApproachName="RNP" />
+        <STAR Name="URBU2B" ApproachName="RNP" />
       </Runway>
       <Runway Name="34" DataRunway="34" />
     </Airport>
@@ -3540,7 +3540,6 @@ RILEY
     <Point Name="BASIV" Type="Fix">-362348.080+1734152.330</Point>
     <Point Name="BASOS" Type="Fix">-453220.950+1691922.130</Point>
     <Point Name="BASOT" Type="Fix">-412831.350+1734324.370</Point>
-    <Point Name="BATAT" Type="Fix">-374440.220+1755516.130</Point>
     <Point Name="BATOS" Type="Fix">-365327.790+1735938.660</Point>
     <Point Name="BATUP" Type="Fix">-365036.150+1754913.870</Point>
     <Point Name="BAVEK" Type="Fix">-212406.150-1591828.620</Point>
@@ -4423,8 +4422,8 @@ RILEY
     <Point Name="LINPI" Type="Fix">-374542.550+1760319.260</Point>
     <Point Name="LOSGA" Type="Fix">-365403.800+1744427.210</Point>
     <Point Name="LOSKO" Type="Fix">-454801.700+1701800.760</Point>
-    <Point Name="LOSTI" Type="Fix">-450430.850+1682250.870</Point>
     <Point Name="LOSTI" Type="Fix">-450431.000+1682251.000</Point>
+    <Point Name="LOSTI" Type="Fix">-450430.850+1682250.870</Point>
     <Point Name="LOTRA" Type="Fix">-201358.750-1590554.080</Point>
     <Point Name="LOVTA" Type="Fix">-415913.950+1713635.160</Point>
     <Point Name="LUBSI" Type="Fix">-412748.620+1734135.210</Point>
@@ -4528,6 +4527,7 @@ RILEY
     <Point Name="MEXEB" Type="Fix">-365840.480+1750556.970</Point>
     <Point Name="MEXIP" Type="Fix">-315000.770-1750000.000</Point>
     <Point Name="MEXIS" Type="Fix">-384625.860+1754800.990</Point>
+    <Point Name="MEZZO" Type="Fix">-374433.540+1755601.670</Point>
     <Point Name="MIBAD" Type="Fix">-550000.000+1722700.000</Point>
     <Point Name="MIBEV" Type="Fix">-412236.730+1725341.370</Point>
     <Point Name="MIBOR" Type="Fix">-205949.550-1610140.090</Point>
@@ -4546,6 +4546,7 @@ RILEY
     <Point Name="MINEK" Type="Fix">-385013.130+1755352.670</Point>
     <Point Name="MINET" Type="Fix">-295643.390+1704759.270</Point>
     <Point Name="MIPAK" Type="Fix">-451656.960+1705228.260</Point>
+    <Point Name="MO401" Type="Fix">-453222.632+1674152.080</Point>
     <Point Name="MO552" Type="Fix">-453153.198+1673832.640</Point>
     <Point Name="MOKER" Type="Fix">-391006.770+1764457.730</Point>
     <Point Name="MOLGI" Type="Fix">-431752.180+1700055.510</Point>
@@ -4747,6 +4748,7 @@ RILEY
     <Point Name="OMUBO" Type="Fix">-450356.600+1683730.650</Point>
     <Point Name="OMUKO" Type="Fix">-411714.060+1730346.520</Point>
     <Point Name="OMULI" Type="Fix">-440730.170+1703022.530</Point>
+    <Point Name="OMUNU" Type="Fix">-393811.090+1741822.920</Point>
     <Point Name="ONADU" Type="Fix">-445455.180+1690436.000</Point>
     <Point Name="ONAGO" Type="Fix">-385232.240+1753042.870</Point>
     <Point Name="ONETU" Type="Fix">-164131.680-1713720.590</Point>
@@ -5321,6 +5323,7 @@ RILEY
     <Point Name="UNTET" Type="Fix">-401101.620+1634403.510</Point>
     <Point Name="UPDAL" Type="Fix">-385704.400+1742024.200</Point>
     <Point Name="UPDIG" Type="Fix">-194816.260-1740935.870</Point>
+    <Point Name="UPGUM" Type="Fix">-453324.440+1674849.810</Point>
     <Point Name="UPKIK" Type="Fix">-462538.960+1682940.920</Point>
     <Point Name="UPKIV" Type="Fix">-374856.100+1750546.550</Point>
     <Point Name="UPLAR" Type="Fix">-353355.220+1710535.290</Point>
@@ -6227,8 +6230,8 @@ RILEY
     <Point Name="QUEENSBERRY PONDS" Type="Fix">-444648.160+1691823.210</Point>
     <Point Name="QUEENSTOWN HILL" Type="Fix">-445948.600+1684206.700</Point>
     <Point Name="RABBIT ISLAND BRIDGE" Type="Fix">-411702.800+1730755.500</Point>
-    <Point Name="RACECOURSE" Type="Fix">-374355.600+1760719.700</Point>
     <Point Name="RACECOURSE" Type="Fix">-412004.800+1731050.500</Point>
+    <Point Name="RACECOURSE" Type="Fix">-374355.600+1760719.700</Point>
     <Point Name="RAETIHI" Type="Fix">-392539.800+1751654.900</Point>
     <Point Name="RAINBOW SKIFIELD" Type="Fix">-415229.400+1725138.800</Point>
     <Point Name="RANGATIRA POINT" Type="Fix">-384417.600+1760100.700</Point>
@@ -6555,7 +6558,7 @@ RILEY
       <Transition Name="SELKA">SELKA</Transition>
       <Transition Name="TARIB">TARIB</Transition>
     </SID>
-    <SID Name="REKI3Q" Airport="NZAA" Runways="05R">
+    <SID Name="REKI4Q" Airport="NZAA" Runways="05R">
       <Route Runway="05R">VINOD/BUDLU/REKIS</Route>
       <Transition Name="KAPAI">KAPAI</Transition>
       <Transition Name="KARRL">LIMES/KARRL</Transition>
@@ -6572,7 +6575,7 @@ RILEY
       <Transition Name="IDSEM">IDSEM</Transition>
       <Transition Name="OLBEX">OLBEX</Transition>
     </SID>
-    <SID Name="STEA1P" Airport="NZAA" Runways="23L">
+    <SID Name="STEA2P" Airport="NZAA" Runways="23L">
       <Route Runway="23L">STEAL</Route>
       <Transition Name="KARRL">LIMES/KARRL</Transition>
       <Transition Name="LAKES">LAMOG/ONISU/OVSIT/LAKES</Transition>
@@ -6977,10 +6980,10 @@ RILEY
       <Route Runway="12">KAROA</Route>
     </SID>
     <SID Name="LUGDU2" Airport="NZLX" Runways="01,14,19,32">
-      <Route Runway="01">LUGDU</Route>
-      <Route Runway="14">LUGDU</Route>
-      <Route Runway="19">LUGDU</Route>
-      <Route Runway="32">LUGDU</Route>
+      <Route Runway="01">PORUT/LUGDU</Route>
+      <Route Runway="14">PORUT/LUGDU</Route>
+      <Route Runway="19">PORUT/LUGDU</Route>
+      <Route Runway="32">PORUT/LUGDU</Route>
       <Transition Name="BE">PORUT/BE NDB</Transition>
       <Transition Name="NV">PORUT/NV VOR</Transition>
       <Transition Name="PORUT">PORUT</Transition>
@@ -6988,7 +6991,7 @@ RILEY
       <Transition Name="SW">PORUT/SW VOR</Transition>
       <Transition Name="TOMID">TOMID</Transition>
     </SID>
-    <SID Name="GULAN2" Airport="NZMO" Runways="08,14,26,32">
+    <SID Name="GULAN3" Airport="NZMO" Runways="08,14,26,32">
       <Route Runway="08">MO552/GULAN</Route>
       <Route Runway="14">MO552/GULAN</Route>
       <Route Runway="26">MO552/GULAN</Route>
@@ -6996,7 +6999,6 @@ RILEY
       <Transition Name="AFTON">AFTON</Transition>
       <Transition Name="ANOPA">ANOPA</Transition>
       <Transition Name="ENKUV">ENKUV</Transition>
-      <Transition Name="SUNGU">SUNGU</Transition>
     </SID>
     <SID Name="LADI3A" Airport="NZMS" Runways="24">
       <Route Runway="24">NIPIR/LADIT</Route>
@@ -7364,12 +7366,13 @@ RILEY
       <Transition Name="ADLUP">REDOL/BASOS/ADLUP</Transition>
       <Transition Name="SUNGU">SUNGU</Transition>
     </SID>
-    <SID Name="VAPLI1" Airport="NZQN" Runways="23">
+    <SID Name="VAPLI2" Airport="NZQN" Runways="23">
       <Route Runway="23">ENKUV/OLREK/TULVU/VAPLI</Route>
       <Transition Name="ADKOS">IPNOR/ENRAT/ADKOS</Transition>
       <Transition Name="ADLUP">IBVUK/SUNGU/BASOS/ADLUP</Transition>
       <Transition Name="LIBLA">IPNOR/BIKOS/LIBLA</Transition>
       <Transition Name="SAVLA">AVDEK/DULUL/ANPOV/AKMAD/NONAN/SAVLA</Transition>
+      <Transition Name="SUNGU">IBVUK/SUNGU</Transition>
       <Transition Name="TIMJO">AVDEK/DULUL/ANPOV/EPDEX/ATVOR/TIMJO</Transition>
     </SID>
     <SID Name="SEBSA1" Airport="NZRC" Runways="04">
@@ -8739,10 +8742,10 @@ RILEY
       <Transition Name="ISGIT">ISGIT</Transition>
       <Transition Name="LUMSO">LUMSO</Transition>
     </STAR>
-    <STAR Name="BIKO1A" Airport="NZTG" Runways="07">
+    <STAR Name="BIKO2A" Airport="NZTG" Runways="07">
       <Route Runway="07">BIKOT/BERPI/RUSTA</Route>
     </STAR>
-    <STAR Name="BIKO1B" Airport="NZTG" Runways="25">
+    <STAR Name="BIKO2B" Airport="NZTG" Runways="25">
       <Route Runway="25">BIKOT/BERPI/RUSTA/UBSET</Route>
     </STAR>
     <STAR Name="FALS1A" Airport="NZTG" Runways="07">
@@ -8751,19 +8754,19 @@ RILEY
     <STAR Name="FALS1B" Airport="NZTG" Runways="25">
       <Route Runway="25">FALLS/RUMRA/TODAN</Route>
     </STAR>
-    <STAR Name="GOBU1A" Airport="NZTG" Runways="07">
+    <STAR Name="GOBU2A" Airport="NZTG" Runways="07">
       <Route Runway="07">GOBUK/MORTA</Route>
     </STAR>
     <STAR Name="GOBU1B" Airport="NZTG" Runways="25">
       <Route Runway="25">GOBUK/TODAN</Route>
     </STAR>
-    <STAR Name="OLDO1A" Airport="NZTG" Runways="07">
-      <Route Runway="07">OLDON/BATAT/MORTA</Route>
+    <STAR Name="OLDO2A" Airport="NZTG" Runways="07">
+      <Route Runway="07">OLDON/MEZZO/MORTA</Route>
     </STAR>
-    <STAR Name="OLDO1B" Airport="NZTG" Runways="25">
+    <STAR Name="OLDO2B" Airport="NZTG" Runways="25">
       <Route Runway="25">OLDON/LINPI/TODAN</Route>
     </STAR>
-    <STAR Name="OROP1A" Airport="NZTG" Runways="07">
+    <STAR Name="OROP2A" Airport="NZTG" Runways="07">
       <Route Runway="07">OROPI/MORTA</Route>
     </STAR>
     <STAR Name="OROP1B" Airport="NZTG" Runways="25">
@@ -8775,10 +8778,10 @@ RILEY
     <STAR Name="PIBO1B" Airport="NZTG" Runways="25">
       <Route Runway="25">PIBOV/TODAN</Route>
     </STAR>
-    <STAR Name="URBU1A" Airport="NZTG" Runways="07">
+    <STAR Name="URBU2A" Airport="NZTG" Runways="07">
       <Route Runway="07">URBUX/APUNO/KIMAR/RUSTA</Route>
     </STAR>
-    <STAR Name="URBU1B" Airport="NZTG" Runways="25">
+    <STAR Name="URBU2B" Airport="NZTG" Runways="25">
       <Route Runway="25">URBUX/APUNO/KIMAR/RUSTA/UBSET</Route>
     </STAR>
     <STAR Name="DOPO1K" Airport="NZTU" Runways="20">
@@ -9209,7 +9212,7 @@ RILEY
     <Approach Name="RNP" Airport="NZMO" Runway="26">
       <Transition Name="ALDEV">ALDEV</Transition>
       <Transition Name="ENSOV">ENSOV</Transition>
-      <Route>GULAN/-45.557250+167.813570/-453204.171+1673946.789</Route>
+      <Route>GULAN/UPGUM/MO401/-453204.171+1673946.789</Route>
     </Approach>
     <Approach Name="RNP" Airport="NZNE" Runway="03">
       <Transition Name="PANGO">PANGO</Transition>
@@ -9843,6 +9846,7 @@ RILEY
       <Runway Name="15" Position="-401158.931+1752309.751" />
       <Runway Name="33" Position="-401302.039+1752325.789" />
     </Airport>
+    <Airport ICAO="NZOI" FullName="Ongaio Island" Position="-404025.000+1723952.000" />
     <Airport ICAO="NZOM" FullName="Omaka" Position="-413224.000+1735519.000">
       <Runway Name="01" Position="-413242.410+1735514.030" />
       <Runway Name="19" Position="-413217.149+1735538.640" />
diff --git a/MET.xml b/MET.xml
index 1be8898..e57cf7e 100644
--- a/MET.xml
+++ b/MET.xml
@@ -5,10 +5,11 @@
     <TAF url="https://aviationweather.gov/adds/dataserver_current/httpparam?dataSource=tafs&amp;requestType=retrieve&amp;format=xml&amp;stationString=%ICAO&amp;hoursBeforeNow=0&amp;timeType=valid&amp;mostRecent=true" xmlDataTag="raw_text" mostRecent="true" />
   </ProductTypes>
   <Browsers>
-    <AIP url="http://www.aip.net.nz/" />
-    <GoPreflight url="https://gopreflight.co.nz/app" />
-    <SkyVector url="https://skyvector.com/" />
     <VATNZ url="https://www.vatnz.net/" />
+    <SOPs url="https://sops.vatnz.net" />
     <Feedback url="https://www.vatnz.net/feedback/" />
+    <Changelog url="https://sops.vatnz.net/changelog/" />
+    <AIP url="http://www.aip.net.nz/" />
+    <GoPreflight url="https://gopreflight.co.nz/app" />
   </Browsers>
 </MET>
\ No newline at end of file
diff --git a/Maps/Airspace/AIRPORTS.xml b/Maps/Airspace/AIRPORTS.xml
index af79a86..d369c98 100644
--- a/Maps/Airspace/AIRPORTS.xml
+++ b/Maps/Airspace/AIRPORTS.xml
@@ -134,6 +134,7 @@
       <Point>NZOF</Point>
       <Point>NZOG</Point>
       <Point>NZOH</Point>
+      <Point>NZOI</Point>
       <Point>NZOM</Point>
       <Point>NZON</Point>
       <Point>NZOP</Point>
@@ -352,6 +353,7 @@
       <Point Name="OF">NZOF</Point>
       <Point Name="OG">NZOG</Point>
       <Point Name="OH">NZOH</Point>
+      <Point Name="OI">NZOI</Point>
       <Point Name="OM">NZOM</Point>
       <Point Name="ON">NZON</Point>
       <Point Name="OP">NZOP</Point>
diff --git a/Maps/Airspace/ALL_RNAV.xml b/Maps/Airspace/ALL_RNAV.xml
index ddc1da2..e0c9fe6 100644
--- a/Maps/Airspace/ALL_RNAV.xml
+++ b/Maps/Airspace/ALL_RNAV.xml
@@ -251,8 +251,10 @@
       <Point>ODISI</Point>
       <Point>AKLAR</Point>
       <Point>ESKAT</Point>
+      <Point>OMGET</Point>
       <Point>LUVOG</Point>
       <Point>VARSI</Point>
+      <Point>PAROA</Point>
       <Point>ELPAM</Point>
       <Point>PAKSA</Point>
       <Point>RUGRU</Point>
@@ -265,11 +267,13 @@
       <Point>UKLIP</Point>
       <Point>ATMAS</Point>
       <Point>MAMUS</Point>
+      <Point>WAPOU</Point>
       <Point>NUKTO</Point>
       <Point>UPVOK</Point>
       <Point>KARVO</Point>
       <Point>ANDEP</Point>
       <Point>BEDAV</Point>
+      <Point>MAKOS</Point>
       <Point>AGTUR</Point>
       <Point>EKVIL</Point>
       <Point>TAYLA</Point>
@@ -383,9 +387,11 @@
       <Point>UPSUV</Point>
       <Point>BURLY</Point>
       <Point>OPOHO</Point>
+      <Point>WYTAK</Point>
       <Point>MAKEE</Point>
       <Point>HALEN</Point>
       <Point>IGOLF</Point>
+      <Point>BAYES</Point>
       <Point>FLAXX</Point>
       <Point>ABUOY</Point>
       <Point>BAZEN</Point>
@@ -399,6 +405,7 @@
       <Point>WS408</Point>
       <Point>ANSIS</Point>
       <Point>PILUP</Point>
+      <Point>UGSAP</Point>
       <Point>IGOVU</Point>
       <Point>OLVOL</Point>
       <Point>DUDED</Point>
@@ -424,7 +431,7 @@
       <Point>SALEK</Point>
       <Point>VESAV</Point>
       <Point>IDPAX</Point>
-      <Point>HA906</Point>
+      <Point>OMUNU</Point>
       <Point>HK406</Point>
       <Point>HK407</Point>
       <Point>LAXOD</Point>
@@ -434,6 +441,7 @@
       <Point>DAKTA</Point>
       <Point>EMVAN</Point>
       <Point>PORUT</Point>
+      <Point>UPGUM</Point>
       <Point>MS488</Point>
       <Point>MS402</Point>
       <Point>RIKDI</Point>
@@ -481,10 +489,6 @@
       <Point>VETUM</Point>
       <Point>BUSBI</Point>
       <Point>ALBAD</Point>
-      <Point>OMGET</Point>
-      <Point>PAROA</Point>
-      <Point>WAPOU</Point>
-      <Point>MAKOS</Point>
       <Point>SADUN</Point>
       <Point>OLNAN</Point>
       <Point>WAIPA</Point>
@@ -493,9 +497,6 @@
       <Point>REGAT</Point>
       <Point>AVMEB</Point>
       <Point>MARKS</Point>
-      <Point>WYTAK</Point>
-      <Point>BAYES</Point>
-      <Point>UGSAP</Point>
     </Label>
     <!--Fix Symbols-->
     <Symbol Type="HollowTriangle">
@@ -506,7 +507,6 @@
       <Point>CH20T</Point>
       <Point>OVSED</Point>
       <Point>IDPON</Point>
-      <Point>GM483</Point>
       <Point>GT403</Point>
       <Point>-39.722220+176.710770</Point>
       <Point>-39.649380+176.763350</Point>
@@ -516,6 +516,7 @@
       <Point>-35.270886+173.916278</Point>
       <Point>KT401</Point>
       <Point>KT501</Point>
+      <Point>LX407</Point>
       <Point>MS603</Point>
       <Point>MS818</Point>
       <Point>MS572</Point>
@@ -539,7 +540,6 @@
       <Point>WR601</Point>
       <Point>WR431</Point>
       <Point>WR983</Point>
-      <Point>WT423</Point>
     </Symbol>
     <!--IAF Symbols-->
     <Symbol Type="HollowTriangle">
@@ -572,8 +572,10 @@
       <Point>ODISI</Point>
       <Point>AKLAR</Point>
       <Point>ESKAT</Point>
+      <Point>OMGET</Point>
       <Point>LUVOG</Point>
       <Point>VARSI</Point>
+      <Point>PAROA</Point>
       <Point>ELPAM</Point>
       <Point>PAKSA</Point>
       <Point>RUGRU</Point>
@@ -586,11 +588,13 @@
       <Point>UKLIP</Point>
       <Point>ATMAS</Point>
       <Point>MAMUS</Point>
+      <Point>WAPOU</Point>
       <Point>NUKTO</Point>
       <Point>UPVOK</Point>
       <Point>KARVO</Point>
       <Point>ANDEP</Point>
       <Point>BEDAV</Point>
+      <Point>MAKOS</Point>
       <Point>AGTUR</Point>
       <Point>EKVIL</Point>
       <Point>TAYLA</Point>
@@ -704,9 +708,11 @@
       <Point>UPSUV</Point>
       <Point>BURLY</Point>
       <Point>OPOHO</Point>
+      <Point>WYTAK</Point>
       <Point>MAKEE</Point>
       <Point>HALEN</Point>
       <Point>IGOLF</Point>
+      <Point>BAYES</Point>
       <Point>FLAXX</Point>
       <Point>ABUOY</Point>
       <Point>BAZEN</Point>
@@ -720,6 +726,7 @@
       <Point>WS408</Point>
       <Point>ANSIS</Point>
       <Point>PILUP</Point>
+      <Point>UGSAP</Point>
       <Point>IGOVU</Point>
       <Point>OLVOL</Point>
       <Point>DUDED</Point>
@@ -748,7 +755,7 @@
       <Point>SALEK</Point>
       <Point>VESAV</Point>
       <Point>IDPAX</Point>
-      <Point>HA906</Point>
+      <Point>OMUNU</Point>
       <Point>HK406</Point>
       <Point>HK407</Point>
       <Point>LAXOD</Point>
@@ -760,7 +767,7 @@
       <Point>DAKTA</Point>
       <Point>EMVAN</Point>
       <Point>PORUT</Point>
-      <Point>-45.557250+167.813570</Point>
+      <Point>UPGUM</Point>
       <Point>MS488</Point>
       <Point>MS402</Point>
       <Point>RIKDI</Point>
@@ -817,10 +824,6 @@
     <!--IF Symbols-->
     <Symbol Type="SolidTriangle">
       <Point>ALBAD</Point>
-      <Point>OMGET</Point>
-      <Point>PAROA</Point>
-      <Point>WAPOU</Point>
-      <Point>MAKOS</Point>
       <Point>SADUN</Point>
       <Point>OLNAN</Point>
       <Point>WAIPA</Point>
@@ -829,9 +832,6 @@
       <Point>REGAT</Point>
       <Point>AVMEB</Point>
       <Point>MARKS</Point>
-      <Point>WYTAK</Point>
-      <Point>BAYES</Point>
-      <Point>UGSAP</Point>
     </Symbol>
     <Line Pattern="Solid">LENGU/UGRUS/IGPOL/-370058.741+1744614.819</Line>
     <Line Pattern="Solid">EMRAG/ORESO/UGOMU/-370023.962+1744820.671</Line>
@@ -865,12 +865,12 @@
     <Line Pattern="Solid">ODISI/DIVSU</Line>
     <Line Pattern="Solid">AKLAR/OVSED/AGESO/-455602.130+1701114.899</Line>
     <Line Pattern="Solid">ESKAT/IDPON/BENRU/-455527.761+1701228.030</Line>
-    <Line Pattern="Solid">OMGET/AVKIN/-361430.210+1752758.990</Line>
+    <Line Pattern="Solid">OMGET/AVKIN/GB678/-361430.210+1752758.990</Line>
     <Line Pattern="Solid">LUVOG/OMGET</Line>
     <Line Pattern="Solid">VARSI/OMGET</Line>
-    <Line Pattern="Solid">AVKIN/-361419.669+1752750.512</Line>
-    <Line Pattern="Solid">AVKIN/-361428.039+1752819.639</Line>
-    <Line Pattern="Solid">AVKIN/-361435.171+1752822.688</Line>
+    <Line Pattern="Solid">GB678/-361419.669+1752750.512</Line>
+    <Line Pattern="Solid">GB678/-361428.039+1752819.639</Line>
+    <Line Pattern="Solid">GB678/-361435.171+1752822.688</Line>
     <Line Pattern="Solid">PAROA/AGRIP/GM483/-422757.820+1711113.949</Line>
     <Line Pattern="Solid">ELPAM/PAROA</Line>
     <Line Pattern="Solid">PAKSA/PAROA</Line>
@@ -885,7 +885,7 @@
     <Line Pattern="Solid">ATMAS/IDPAX/GT403/-435421.931+1700739.900</Line>
     <Line Pattern="Solid">MAMUS/ATMAS</Line>
     <Line Pattern="Solid">GT403/-435455.541+1700747.791</Line>
-    <Line Pattern="Solid">WAPOU/HA906/-393328.181+1741610.988</Line>
+    <Line Pattern="Solid">WAPOU/OMUNU/-393328.181+1741610.988</Line>
     <Line Pattern="Solid">NUKTO/WAPOU</Line>
     <Line Pattern="Solid">UPVOK/WAPOU</Line>
     <Line Pattern="Solid">KARVO/HK406/-424248.218+1705848.929</Line>
@@ -904,13 +904,13 @@
     <Line Pattern="Solid">OPARE/-35.343650+173.939047/-35.270886+173.916278/-351546.091+1735449.500</Line>
     <Line Pattern="Solid">STEED/DAKTA/KT401/-350352.330+1731651.650</Line>
     <Line Pattern="Solid">PERIA/EMVAN/KT501/-350428.229+1731725.660</Line>
-    <Line Pattern="Solid">LUGDU/PORUT/-451249.460+1692206.539</Line>
+    <Line Pattern="Solid">LUGDU/PORUT/LX407/-451249.460+1692206.539</Line>
     <Line Pattern="Solid">BESMO/LUGDU</Line>
     <Line Pattern="Solid">KAKIT/LUGDU</Line>
-    <Line Pattern="Solid">PORUT/-451222.770+1692208.350</Line>
-    <Line Pattern="Solid">PORUT/-451233.000+1692219.409</Line>
-    <Line Pattern="Solid">PORUT/-451259.198+1692227.592</Line>
-    <Line Pattern="Solid">GULAN/-45.557250+167.813570/-453204.171+1673946.789</Line>
+    <Line Pattern="Solid">LX407/-451222.770+1692208.350</Line>
+    <Line Pattern="Solid">LX407/-451233.000+1692219.409</Line>
+    <Line Pattern="Solid">LX407/-451259.198+1692227.592</Line>
+    <Line Pattern="Solid">GULAN/UPGUM/MO401/-453204.171+1673946.789</Line>
     <Line Pattern="Solid">ALDEV/GULAN</Line>
     <Line Pattern="Solid">ENSOV/GULAN</Line>
     <Line Pattern="Solid">MAMOD/MS603/MS488/MS818/-405833.121+1753739.180</Line>
diff --git a/Maps/Airspace/FIR Boundaries.xml b/Maps/Airspace/FIR Boundaries.xml
index 65db2ea..da65f75 100644
--- a/Maps/Airspace/FIR Boundaries.xml	
+++ b/Maps/Airspace/FIR Boundaries.xml	
@@ -65,5 +65,63 @@
 -392213.511+1711704.723/
 -390848.597+1713128.005/
 -390738.100+1713321.700</Line>
+    <!--Auckland Oceanic - Tasman Sector-->
+    <Line Name="NZZT" Pattern="Solid">
+-455459.994+1651800.000/
+-450000.000+1630000.000/
+-300000.000+1630000.000/
+-341507.128+1722958.200/
+-343645.730+1715700.871/
+-344915.175+1714212.663/
+-350243.744+1712842.715/
+-351705.755+1711637.346/
+-353215.108+1710602.430/
+-354805.314+1705703.339/
+-360429.530+1704944.901/
+-362120.605+1704411.346/
+-363831.115+1704026.251/
+-365553.417+1703832.490/
+-371319.693+1703832.181/
+-373042.007+1704026.636/
+-374752.362+1704416.310/
+-380442.756+1705000.757/
+-382105.251+1705738.593/
+-383652.034+1710707.458/
+-385155.489+1711823.997/
+-390608.263+1713123.846/
+-390738.032+1713321.982/
+-392213.092+1711705.684/
+-393631.609+1710410.771/
+-395137.731+1705250.543/
+-400725.064+1704310.833/
+-402346.853+1703516.936/
+-404036.022+1702913.548/
+-405745.212+1702504.710/
+-411506.825+1702253.747/
+-412527.005+1702324.000/
+-413400.000+1701435.005/
+-424916.997+1685447.894/
+-424931.815+1683131.106/
+-425057.466+1681610.746/
+-425319.565+1680103.003/
+-425637.138+1674614.112/
+-430048.828+1673150.221/
+-430552.901+1671757.360/
+-431147.256+1670441.408/
+-431829.432+1665208.064/
+-432556.625+1664022.815/
+-433405.701+1662930.902/
+-434253.211+1661937.284/
+-435215.409+1661046.605/
+-440208.278+1660303.155/
+-441227.547+1655630.837/
+-442308.718+1655113.127/
+-443407.095+1654713.035/
+-444517.814+1654433.072/
+-445635.871+1654315.205/
+-450756.160+1654320.832/
+-451913.507+1654450.737/
+-453013.003+1654842.991/
+-455459.994+1651800.000</Line>
   </Map>
 </Maps>
\ No newline at end of file
diff --git a/Maps/NZAA/AA_ACU.xml b/Maps/NZAA/AA_ACU.xml
index 1d3daa9..6b2017c 100644
--- a/Maps/NZAA/AA_ACU.xml
+++ b/Maps/NZAA/AA_ACU.xml
@@ -144,27 +144,27 @@
       RAXIN/TARIB
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy05R REKI3Q-->
+      <!--Rwy05R REKI4Q-->
       AA05R/-36.991111+174.855000/VINOD/-37.118611+174.868889/BUDLU/REKIS
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy05R REKI3Q.KAPAI-->
+      <!--Rwy05R REKI4Q.KAPAI-->
       REKIS/KAPAI
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy05R REKI3Q.KARRL-->
+      <!--Rwy05R REKI4Q.KARRL-->
       REKIS/LIMES
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy05R REKI3Q.LAKES-->
+      <!--Rwy05R REKI4Q.LAKES-->
       REKIS/LAKES
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy05R REKI3Q.NUTRA-->
+      <!--Rwy05R REKI4Q.NUTRA-->
       REKIS/IPDIN
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy05R REKI3Q.TULMI-->
+      <!--Rwy05R REKI4Q.TULMI-->
       REKIS/TULMI
     </Line>
     <Line Pattern="Dashed">
@@ -818,23 +818,23 @@
       POSUX/VELMO
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy23L STEA1P-->
+      <!--Rwy23L STEA2P-->
       -37.031667+174.709444/STEAL
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy23L STEA1P.KARRL-->
+      <!--Rwy23L STEA2P.KARRL-->
       STEAL/LIMES/KARRL
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy23L STEA1P.LAKES-->
+      <!--Rwy23L STEA2P.LAKES-->
       STEAL/LAMOG/ONISU/OVSIT/LAKES
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy23L STEA1P.NUTRA-->
+      <!--Rwy23L STEA2P.NUTRA-->
       STEAL/IPDIN/NUTRA
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy23L STEA1P.TULMI-->
+      <!--Rwy23L STEA2P.TULMI-->
       OVSIT/TULMI
     </Line>
     <Symbol Type="Circle">
diff --git a/Maps/NZGB/GB_ACU.xml b/Maps/NZGB/GB_ACU.xml
index 538e63c..87370c0 100644
--- a/Maps/NZGB/GB_ACU.xml
+++ b/Maps/NZGB/GB_ACU.xml
@@ -5,6 +5,7 @@
     <Symbol Type="HollowTriangle" />
     <!--IAF Symbols-->
     <Symbol Type="HollowTriangle">
+      <Point>OMGET</Point>
       <Point>LUVOG</Point>
       <Point>VARSI</Point>
     </Symbol>
@@ -13,19 +14,17 @@
       <Point>AVKIN</Point>
     </Symbol>
     <!--IF Symbols-->
-    <Symbol Type="SolidTriangle">
-      <Point>OMGET</Point>
-    </Symbol>
-    <Line Pattern="Solid">OMGET/AVKIN/-361430.210+1752758.990</Line>
+    <Symbol Type="SolidTriangle" />
+    <Line Pattern="Solid">OMGET/AVKIN/GB678/-361430.210+1752758.990</Line>
     <Line Pattern="Solid">LUVOG/OMGET</Line>
     <Line Pattern="Solid">VARSI/OMGET</Line>
   </Map>
   <Map Type="System2" Name="06 RNP Labels" Priority="1" Center="-36.241725+175.466386" CustomColourName="ProcArr">
     <Label HasLeader="true">
+      <Point>OMGET</Point>
       <Point>LUVOG</Point>
       <Point>VARSI</Point>
       <Point>AVKIN</Point>
-      <Point>OMGET</Point>
     </Label>
   </Map>
   <Map Type="System2" Name="24 RNP" Priority="1" Center="-36.241122+175.472122" CustomColourName="ProcArr">
@@ -33,6 +32,7 @@
     <Symbol Type="HollowTriangle" />
     <!--IAF Symbols-->
     <Symbol Type="HollowTriangle">
+      <Point>OMGET</Point>
       <Point>LUVOG</Point>
       <Point>VARSI</Point>
     </Symbol>
@@ -41,19 +41,17 @@
       <Point>AVKIN</Point>
     </Symbol>
     <!--IF Symbols-->
-    <Symbol Type="SolidTriangle">
-      <Point>OMGET</Point>
-    </Symbol>
-    <Line Pattern="Solid">OMGET/AVKIN/-361428.039+1752819.639</Line>
+    <Symbol Type="SolidTriangle" />
+    <Line Pattern="Solid">OMGET/AVKIN/GB678/-361428.039+1752819.639</Line>
     <Line Pattern="Solid">LUVOG/OMGET</Line>
     <Line Pattern="Solid">VARSI/OMGET</Line>
   </Map>
   <Map Type="System2" Name="24 RNP Labels" Priority="1" Center="-36.241122+175.472122" CustomColourName="ProcArr">
     <Label HasLeader="true">
+      <Point>OMGET</Point>
       <Point>LUVOG</Point>
       <Point>VARSI</Point>
       <Point>AVKIN</Point>
-      <Point>OMGET</Point>
     </Label>
   </Map>
   <Map Type="System2" Name="10 SIDs" Priority="1" CustomColourName="ProcDep" Center="-36.243103+175.472969">
@@ -76,6 +74,7 @@
     <Symbol Type="HollowTriangle" />
     <!--IAF Symbols-->
     <Symbol Type="HollowTriangle">
+      <Point>OMGET</Point>
       <Point>LUVOG</Point>
       <Point>VARSI</Point>
     </Symbol>
@@ -84,19 +83,17 @@
       <Point>AVKIN</Point>
     </Symbol>
     <!--IF Symbols-->
-    <Symbol Type="SolidTriangle">
-      <Point>OMGET</Point>
-    </Symbol>
-    <Line Pattern="Solid">OMGET/AVKIN/-361419.669+1752750.512</Line>
+    <Symbol Type="SolidTriangle" />
+    <Line Pattern="Solid">OMGET/AVKIN/GB678/-361419.669+1752750.512</Line>
     <Line Pattern="Solid">LUVOG/OMGET</Line>
     <Line Pattern="Solid">VARSI/OMGET</Line>
   </Map>
   <Map Type="System2" Name="10 RNP Labels" Priority="1" Center="-36.238797+175.464031" CustomColourName="ProcArr">
     <Label HasLeader="true">
+      <Point>OMGET</Point>
       <Point>LUVOG</Point>
       <Point>VARSI</Point>
       <Point>AVKIN</Point>
-      <Point>OMGET</Point>
     </Label>
   </Map>
   <Map Type="System2" Name="28 RNP" Priority="1" Center="-36.243103+175.472969" CustomColourName="ProcArr">
@@ -104,6 +101,7 @@
     <Symbol Type="HollowTriangle" />
     <!--IAF Symbols-->
     <Symbol Type="HollowTriangle">
+      <Point>OMGET</Point>
       <Point>LUVOG</Point>
       <Point>VARSI</Point>
     </Symbol>
@@ -112,19 +110,17 @@
       <Point>AVKIN</Point>
     </Symbol>
     <!--IF Symbols-->
-    <Symbol Type="SolidTriangle">
-      <Point>OMGET</Point>
-    </Symbol>
-    <Line Pattern="Solid">OMGET/AVKIN/-361435.171+1752822.688</Line>
+    <Symbol Type="SolidTriangle" />
+    <Line Pattern="Solid">OMGET/AVKIN/GB678/-361435.171+1752822.688</Line>
     <Line Pattern="Solid">LUVOG/OMGET</Line>
     <Line Pattern="Solid">VARSI/OMGET</Line>
   </Map>
   <Map Type="System2" Name="28 RNP Labels" Priority="1" Center="-36.243103+175.472969" CustomColourName="ProcArr">
     <Label HasLeader="true">
+      <Point>OMGET</Point>
       <Point>LUVOG</Point>
       <Point>VARSI</Point>
       <Point>AVKIN</Point>
-      <Point>OMGET</Point>
     </Label>
   </Map>
   <Map Type="System2" Name="VFRPoint" Priority="1" CustomColourName="VFRPoint" Center="-36.241389+175.471944">
diff --git a/Maps/NZGM/GM_ACU.xml b/Maps/NZGM/GM_ACU.xml
index f9080f8..8c568cd 100644
--- a/Maps/NZGM/GM_ACU.xml
+++ b/Maps/NZGM/GM_ACU.xml
@@ -69,11 +69,10 @@
   </Map>
   <Map Type="System2" Name="01 RNP" Priority="1" Center="-42.466061+171.187208" CustomColourName="ProcArr">
     <!--Fix Symbols-->
-    <Symbol Type="HollowTriangle">
-      <Point>GM483</Point>
-    </Symbol>
+    <Symbol Type="HollowTriangle" />
     <!--IAF Symbols-->
     <Symbol Type="HollowTriangle">
+      <Point>PAROA</Point>
       <Point>ELPAM</Point>
       <Point>PAKSA</Point>
     </Symbol>
@@ -82,19 +81,17 @@
       <Point>AGRIP</Point>
     </Symbol>
     <!--IF Symbols-->
-    <Symbol Type="SolidTriangle">
-      <Point>PAROA</Point>
-    </Symbol>
+    <Symbol Type="SolidTriangle" />
     <Line Pattern="Solid">PAROA/AGRIP/GM483/-422757.820+1711113.949</Line>
     <Line Pattern="Solid">ELPAM/PAROA</Line>
     <Line Pattern="Solid">PAKSA/PAROA</Line>
   </Map>
   <Map Type="System2" Name="01 RNP Labels" Priority="1" Center="-42.466061+171.187208" CustomColourName="ProcArr">
     <Label HasLeader="true">
+      <Point>PAROA</Point>
       <Point>ELPAM</Point>
       <Point>PAKSA</Point>
       <Point>AGRIP</Point>
-      <Point>PAROA</Point>
     </Label>
   </Map>
   <Map Type="System2" Name="19 SIDs" Priority="1" CustomColourName="ProcDep" Center="-42.466061+171.187208">
diff --git a/Maps/NZHA/HA_ACU.xml b/Maps/NZHA/HA_ACU.xml
index 87161c6..35f2d68 100644
--- a/Maps/NZHA/HA_ACU.xml
+++ b/Maps/NZHA/HA_ACU.xml
@@ -5,27 +5,26 @@
     <Symbol Type="HollowTriangle" />
     <!--IAF Symbols-->
     <Symbol Type="HollowTriangle">
+      <Point>WAPOU</Point>
       <Point>NUKTO</Point>
       <Point>UPVOK</Point>
     </Symbol>
     <!--FAF Symbols-->
     <Symbol Type="MalteseCross">
-      <Point>HA906</Point>
+      <Point>OMUNU</Point>
     </Symbol>
     <!--IF Symbols-->
-    <Symbol Type="SolidTriangle">
-      <Point>WAPOU</Point>
-    </Symbol>
-    <Line Pattern="Solid">WAPOU/HA906/-393328.181+1741610.988</Line>
+    <Symbol Type="SolidTriangle" />
+    <Line Pattern="Solid">WAPOU/OMUNU/-393328.181+1741610.988</Line>
     <Line Pattern="Solid">NUKTO/WAPOU</Line>
     <Line Pattern="Solid">UPVOK/WAPOU</Line>
   </Map>
   <Map Type="System2" Name="32 RNP Labels" Priority="1" Center="-39.557828+174.269719" CustomColourName="ProcArr">
     <Label HasLeader="true">
+      <Point>WAPOU</Point>
       <Point>NUKTO</Point>
       <Point>UPVOK</Point>
-      <Point>HA906</Point>
-      <Point>WAPOU</Point>
+      <Point>OMUNU</Point>
     </Label>
   </Map>
   <Map Type="System2" Name="VFRPoint" Priority="1" CustomColourName="VFRPoint" Center="-39.553333+174.266944">
diff --git a/Maps/NZHK/HK_ACU.xml b/Maps/NZHK/HK_ACU.xml
index cd7c747..e6e5d48 100644
--- a/Maps/NZHK/HK_ACU.xml
+++ b/Maps/NZHK/HK_ACU.xml
@@ -119,6 +119,7 @@
     <Symbol Type="HollowTriangle" />
     <!--IAF Symbols-->
     <Symbol Type="HollowTriangle">
+      <Point>MAKOS</Point>
       <Point>AGTUR</Point>
       <Point>EKVIL</Point>
     </Symbol>
@@ -127,19 +128,17 @@
       <Point>HK407</Point>
     </Symbol>
     <!--IF Symbols-->
-    <Symbol Type="SolidTriangle">
-      <Point>MAKOS</Point>
-    </Symbol>
+    <Symbol Type="SolidTriangle" />
     <Line Pattern="Solid">MAKOS/HK407/-424227.950+1705931.448</Line>
     <Line Pattern="Solid">AGTUR/MAKOS</Line>
     <Line Pattern="Solid">EKVIL/MAKOS</Line>
   </Map>
   <Map Type="System2" Name="21 RNP Labels" Priority="1" Center="-42.707764+170.992069" CustomColourName="ProcArr">
     <Label HasLeader="true">
+      <Point>MAKOS</Point>
       <Point>AGTUR</Point>
       <Point>EKVIL</Point>
       <Point>HK407</Point>
-      <Point>MAKOS</Point>
     </Label>
   </Map>
   <Map Type="System2" Name="VFRPoint" Priority="1" CustomColourName="VFRPoint" Center="-42.713611+170.985278">
diff --git a/Maps/NZLX/LX_ACU.xml b/Maps/NZLX/LX_ACU.xml
index 58c6733..6701e3c 100644
--- a/Maps/NZLX/LX_ACU.xml
+++ b/Maps/NZLX/LX_ACU.xml
@@ -3,7 +3,7 @@
   <Map Type="System2" Name="01 SIDs" Priority="1" CustomColourName="ProcDep" Center="-45.209167+169.372058">
     <Line Pattern="Dashed">
       <!--Rwy01 LUGDU2-->
-      -45.209167+169.372058/LX32T/LUGDU
+      -45.209167+169.372058/PORUT/LUGDU
     </Line>
     <Line Pattern="Dashed">
       <!--Rwy01 LUGDU2.BE-->
@@ -28,6 +28,9 @@
       <!--Rwy01 LUGDU2.TOMID-->
       LUGDU/TOMID
     </Line>
+    <Symbol Type="SolidStar">
+      <Point>PORUT</Point>
+    </Symbol>
     <Symbol Type="Circle">
       <Point>BE NDB</Point>
       <Point>NV VOR</Point>
@@ -35,9 +38,7 @@
       <Point>SW VOR</Point>
     </Symbol>
     <Symbol Type="HollowTriangle">
-      <Point>LX32T</Point>
       <Point>LUGDU</Point>
-      <Point>PORUT</Point>
       <Point>TOMID</Point>
     </Symbol>
     <Label HasLeader="true">
@@ -52,7 +53,9 @@
   </Map>
   <Map Type="System2" Name="01 RNP" Priority="1" Center="-45.213739+169.368483" CustomColourName="ProcArr">
     <!--Fix Symbols-->
-    <Symbol Type="HollowTriangle" />
+    <Symbol Type="HollowTriangle">
+      <Point>LX407</Point>
+    </Symbol>
     <!--IAF Symbols-->
     <Symbol Type="HollowTriangle">
       <Point>LUGDU</Point>
@@ -65,7 +68,7 @@
     </Symbol>
     <!--IF Symbols-->
     <Symbol Type="SolidTriangle" />
-    <Line Pattern="Solid">LUGDU/PORUT/-451249.460+1692206.539</Line>
+    <Line Pattern="Solid">LUGDU/PORUT/LX407/-451249.460+1692206.539</Line>
     <Line Pattern="Solid">BESMO/LUGDU</Line>
     <Line Pattern="Solid">KAKIT/LUGDU</Line>
   </Map>
@@ -80,7 +83,7 @@
   <Map Type="System2" Name="19 SIDs" Priority="1" CustomColourName="ProcDep" Center="-45.213739+169.368483">
     <Line Pattern="Dashed">
       <!--Rwy19 LUGDU2-->
-      -45.213739+169.368483/LX32T/LUGDU
+      -45.213739+169.368483/PORUT/LUGDU
     </Line>
     <Line Pattern="Dashed">
       <!--Rwy19 LUGDU2.BE-->
@@ -105,6 +108,9 @@
       <!--Rwy19 LUGDU2.TOMID-->
       LUGDU/TOMID
     </Line>
+    <Symbol Type="SolidStar">
+      <Point>PORUT</Point>
+    </Symbol>
     <Symbol Type="Circle">
       <Point>BE NDB</Point>
       <Point>NV VOR</Point>
@@ -112,9 +118,7 @@
       <Point>SW VOR</Point>
     </Symbol>
     <Symbol Type="HollowTriangle">
-      <Point>LX32T</Point>
       <Point>LUGDU</Point>
-      <Point>PORUT</Point>
       <Point>TOMID</Point>
     </Symbol>
     <Label HasLeader="true">
@@ -129,7 +133,9 @@
   </Map>
   <Map Type="System2" Name="19 RNP" Priority="1" Center="-45.209167+169.372058" CustomColourName="ProcArr">
     <!--Fix Symbols-->
-    <Symbol Type="HollowTriangle" />
+    <Symbol Type="HollowTriangle">
+      <Point>LX407</Point>
+    </Symbol>
     <!--IAF Symbols-->
     <Symbol Type="HollowTriangle">
       <Point>LUGDU</Point>
@@ -142,7 +148,7 @@
     </Symbol>
     <!--IF Symbols-->
     <Symbol Type="SolidTriangle" />
-    <Line Pattern="Solid">LUGDU/PORUT/-451233.000+1692219.409</Line>
+    <Line Pattern="Solid">LUGDU/PORUT/LX407/-451233.000+1692219.409</Line>
     <Line Pattern="Solid">BESMO/LUGDU</Line>
     <Line Pattern="Solid">KAKIT/LUGDU</Line>
   </Map>
@@ -157,7 +163,7 @@
   <Map Type="System2" Name="14 SIDs" Priority="1" CustomColourName="ProcDep" Center="-45.216444+169.374331">
     <Line Pattern="Dashed">
       <!--Rwy14 LUGDU2-->
-      -45.216444+169.374331/LX32T/LUGDU
+      -45.216444+169.374331/PORUT/LUGDU
     </Line>
     <Line Pattern="Dashed">
       <!--Rwy14 LUGDU2.BE-->
@@ -182,6 +188,9 @@
       <!--Rwy14 LUGDU2.TOMID-->
       LUGDU/TOMID
     </Line>
+    <Symbol Type="SolidStar">
+      <Point>PORUT</Point>
+    </Symbol>
     <Symbol Type="Circle">
       <Point>BE NDB</Point>
       <Point>NV VOR</Point>
@@ -189,9 +198,7 @@
       <Point>SW VOR</Point>
     </Symbol>
     <Symbol Type="HollowTriangle">
-      <Point>LX32T</Point>
       <Point>LUGDU</Point>
-      <Point>PORUT</Point>
       <Point>TOMID</Point>
     </Symbol>
     <Label HasLeader="true">
@@ -206,7 +213,9 @@
   </Map>
   <Map Type="System2" Name="14 RNP" Priority="1" Center="-45.206325+169.368986" CustomColourName="ProcArr">
     <!--Fix Symbols-->
-    <Symbol Type="HollowTriangle" />
+    <Symbol Type="HollowTriangle">
+      <Point>LX407</Point>
+    </Symbol>
     <!--IAF Symbols-->
     <Symbol Type="HollowTriangle">
       <Point>LUGDU</Point>
@@ -219,7 +228,7 @@
     </Symbol>
     <!--IF Symbols-->
     <Symbol Type="SolidTriangle" />
-    <Line Pattern="Solid">LUGDU/PORUT/-451222.770+1692208.350</Line>
+    <Line Pattern="Solid">LUGDU/PORUT/LX407/-451222.770+1692208.350</Line>
     <Line Pattern="Solid">BESMO/LUGDU</Line>
     <Line Pattern="Solid">KAKIT/LUGDU</Line>
   </Map>
@@ -234,7 +243,7 @@
   <Map Type="System2" Name="32 SIDs" Priority="1" CustomColourName="ProcDep" Center="-45.206325+169.368986">
     <Line Pattern="Dashed">
       <!--Rwy32 LUGDU2-->
-      -45.206325+169.368986/LX32T/LUGDU
+      -45.206325+169.368986/PORUT/LUGDU
     </Line>
     <Line Pattern="Dashed">
       <!--Rwy32 LUGDU2.BE-->
@@ -259,6 +268,9 @@
       <!--Rwy32 LUGDU2.TOMID-->
       LUGDU/TOMID
     </Line>
+    <Symbol Type="SolidStar">
+      <Point>PORUT</Point>
+    </Symbol>
     <Symbol Type="Circle">
       <Point>BE NDB</Point>
       <Point>NV VOR</Point>
@@ -266,9 +278,7 @@
       <Point>SW VOR</Point>
     </Symbol>
     <Symbol Type="HollowTriangle">
-      <Point>LX32T</Point>
       <Point>LUGDU</Point>
-      <Point>PORUT</Point>
       <Point>TOMID</Point>
     </Symbol>
     <Label HasLeader="true">
@@ -283,7 +293,9 @@
   </Map>
   <Map Type="System2" Name="32 RNP" Priority="1" Center="-45.216444+169.374331" CustomColourName="ProcArr">
     <!--Fix Symbols-->
-    <Symbol Type="HollowTriangle" />
+    <Symbol Type="HollowTriangle">
+      <Point>LX407</Point>
+    </Symbol>
     <!--IAF Symbols-->
     <Symbol Type="HollowTriangle">
       <Point>LUGDU</Point>
@@ -296,7 +308,7 @@
     </Symbol>
     <!--IF Symbols-->
     <Symbol Type="SolidTriangle" />
-    <Line Pattern="Solid">LUGDU/PORUT/-451259.198+1692227.592</Line>
+    <Line Pattern="Solid">LUGDU/PORUT/LX407/-451259.198+1692227.592</Line>
     <Line Pattern="Solid">BESMO/LUGDU</Line>
     <Line Pattern="Solid">KAKIT/LUGDU</Line>
   </Map>
diff --git a/Maps/NZMO/MO_ACU.xml b/Maps/NZMO/MO_ACU.xml
index ed8da07..292e41e 100644
--- a/Maps/NZMO/MO_ACU.xml
+++ b/Maps/NZMO/MO_ACU.xml
@@ -2,76 +2,68 @@
 <Maps>
   <Map Type="System2" Name="08 SIDs" Priority="1" CustomColourName="ProcDep" Center="-45.534492+167.662997">
     <Line Pattern="Dashed">
-      <!--Rwy08 GULAN2-->
+      <!--Rwy08 GULAN3-->
       -45.534492+167.662997/MO552/GULAN
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy08 GULAN2.AFTON-->
+      <!--Rwy08 GULAN3.AFTON-->
       GULAN/AFTON
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy08 GULAN2.ANOPA-->
+      <!--Rwy08 GULAN3.ANOPA-->
       GULAN/ANOPA
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy08 GULAN2.ENKUV-->
+      <!--Rwy08 GULAN3.ENKUV-->
       GULAN/ENKUV
     </Line>
-    <Line Pattern="Dashed">
-      <!--Rwy08 GULAN2.SUNGU-->
-      GULAN/SUNGU
-    </Line>
-    <Symbol Type="HollowTriangle">
+    <Symbol Type="SolidStar">
       <Point>MO552</Point>
+    </Symbol>
+    <Symbol Type="HollowTriangle">
       <Point>GULAN</Point>
       <Point>AFTON</Point>
       <Point>ANOPA</Point>
       <Point>ENKUV</Point>
-      <Point>SUNGU</Point>
     </Symbol>
     <Label HasLeader="true">
       <Point>GULAN</Point>
       <Point>AFTON</Point>
       <Point>ANOPA</Point>
       <Point>ENKUV</Point>
-      <Point>SUNGU</Point>
     </Label>
   </Map>
   <Map Type="System2" Name="26 SIDs" Priority="1" CustomColourName="ProcDep" Center="-45.531567+167.643186">
     <Line Pattern="Dashed">
-      <!--Rwy26 GULAN2-->
+      <!--Rwy26 GULAN3-->
       -45.531567+167.643186/MO552/GULAN
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy26 GULAN2.AFTON-->
+      <!--Rwy26 GULAN3.AFTON-->
       GULAN/AFTON
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy26 GULAN2.ANOPA-->
+      <!--Rwy26 GULAN3.ANOPA-->
       GULAN/ANOPA
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy26 GULAN2.ENKUV-->
+      <!--Rwy26 GULAN3.ENKUV-->
       GULAN/ENKUV
     </Line>
-    <Line Pattern="Dashed">
-      <!--Rwy26 GULAN2.SUNGU-->
-      GULAN/SUNGU
-    </Line>
-    <Symbol Type="HollowTriangle">
+    <Symbol Type="SolidStar">
       <Point>MO552</Point>
+    </Symbol>
+    <Symbol Type="HollowTriangle">
       <Point>GULAN</Point>
       <Point>AFTON</Point>
       <Point>ANOPA</Point>
       <Point>ENKUV</Point>
-      <Point>SUNGU</Point>
     </Symbol>
     <Label HasLeader="true">
       <Point>GULAN</Point>
       <Point>AFTON</Point>
       <Point>ANOPA</Point>
       <Point>ENKUV</Point>
-      <Point>SUNGU</Point>
     </Label>
   </Map>
   <Map Type="System2" Name="26 STARs" Priority="1" CustomColourName="ProcArr" Center="-45.534492+167.662997">
@@ -109,11 +101,11 @@
     </Symbol>
     <!--FAF Symbols-->
     <Symbol Type="MalteseCross">
-      <Point>-45.557250+167.813570</Point>
+      <Point>UPGUM</Point>
     </Symbol>
     <!--IF Symbols-->
     <Symbol Type="SolidTriangle" />
-    <Line Pattern="Solid">GULAN/-45.557250+167.813570/-453204.171+1673946.789</Line>
+    <Line Pattern="Solid">GULAN/UPGUM/MO401/-453204.171+1673946.789</Line>
     <Line Pattern="Solid">ALDEV/GULAN</Line>
     <Line Pattern="Solid">ENSOV/GULAN</Line>
   </Map>
@@ -122,80 +114,73 @@
       <Point>GULAN</Point>
       <Point>ALDEV</Point>
       <Point>ENSOV</Point>
+      <Point>UPGUM</Point>
     </Label>
   </Map>
   <Map Type="System2" Name="14 SIDs" Priority="1" CustomColourName="ProcDep" Center="-45.538742+167.648619">
     <Line Pattern="Dashed">
-      <!--Rwy14 GULAN2-->
+      <!--Rwy14 GULAN3-->
       -45.538742+167.648619/MO552/GULAN
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy14 GULAN2.AFTON-->
+      <!--Rwy14 GULAN3.AFTON-->
       GULAN/AFTON
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy14 GULAN2.ANOPA-->
+      <!--Rwy14 GULAN3.ANOPA-->
       GULAN/ANOPA
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy14 GULAN2.ENKUV-->
+      <!--Rwy14 GULAN3.ENKUV-->
       GULAN/ENKUV
     </Line>
-    <Line Pattern="Dashed">
-      <!--Rwy14 GULAN2.SUNGU-->
-      GULAN/SUNGU
-    </Line>
-    <Symbol Type="HollowTriangle">
+    <Symbol Type="SolidStar">
       <Point>MO552</Point>
+    </Symbol>
+    <Symbol Type="HollowTriangle">
       <Point>GULAN</Point>
       <Point>AFTON</Point>
       <Point>ANOPA</Point>
       <Point>ENKUV</Point>
-      <Point>SUNGU</Point>
     </Symbol>
     <Label HasLeader="true">
       <Point>GULAN</Point>
       <Point>AFTON</Point>
       <Point>ANOPA</Point>
       <Point>ENKUV</Point>
-      <Point>SUNGU</Point>
     </Label>
   </Map>
   <Map Type="System2" Name="32 SIDs" Priority="1" CustomColourName="ProcDep" Center="-45.528525+167.643922">
     <Line Pattern="Dashed">
-      <!--Rwy32 GULAN2-->
+      <!--Rwy32 GULAN3-->
       -45.528525+167.643922/MO552/GULAN
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy32 GULAN2.AFTON-->
+      <!--Rwy32 GULAN3.AFTON-->
       GULAN/AFTON
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy32 GULAN2.ANOPA-->
+      <!--Rwy32 GULAN3.ANOPA-->
       GULAN/ANOPA
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy32 GULAN2.ENKUV-->
+      <!--Rwy32 GULAN3.ENKUV-->
       GULAN/ENKUV
     </Line>
-    <Line Pattern="Dashed">
-      <!--Rwy32 GULAN2.SUNGU-->
-      GULAN/SUNGU
-    </Line>
-    <Symbol Type="HollowTriangle">
+    <Symbol Type="SolidStar">
       <Point>MO552</Point>
+    </Symbol>
+    <Symbol Type="HollowTriangle">
       <Point>GULAN</Point>
       <Point>AFTON</Point>
       <Point>ANOPA</Point>
       <Point>ENKUV</Point>
-      <Point>SUNGU</Point>
     </Symbol>
     <Label HasLeader="true">
       <Point>GULAN</Point>
       <Point>AFTON</Point>
       <Point>ANOPA</Point>
       <Point>ENKUV</Point>
-      <Point>SUNGU</Point>
     </Label>
   </Map>
   <Map Type="System2" Name="VFRPoint" Priority="1" CustomColourName="VFRPoint" Center="-45.533056+167.650000">
diff --git a/Maps/NZQN/QN_ACU.xml b/Maps/NZQN/QN_ACU.xml
index d380926..d2a426f 100644
--- a/Maps/NZQN/QN_ACU.xml
+++ b/Maps/NZQN/QN_ACU.xml
@@ -278,28 +278,34 @@
       OMLEL/SUNGU
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy23 VAPLI1-->
+      <!--Rwy23 VAPLI2-->
       -45.020000+168.735689/ENKUV/OLREK/TULVU/VAPLI
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy23 VAPLI1.ADKOS-->
+      <!--Rwy23 VAPLI2.ADKOS-->
       VAPLI/IPNOR
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy23 VAPLI1.ADLUP-->
+      <!--Rwy23 VAPLI2.ADLUP-->
       VAPLI/IBVUK/SUNGU/BASOS
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy23 VAPLI1.LIBLA-->
+      <!--Rwy23 VAPLI2.LIBLA-->
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy23 VAPLI1.SAVLA-->
+      <!--Rwy23 VAPLI2.SAVLA-->
       VAPLI/AVDEK/DULUL/ANPOV
     </Line>
     <Line Pattern="Dashed">
-      <!--Rwy23 VAPLI1.TIMJO-->
+      <!--Rwy23 VAPLI2.SUNGU-->
+    </Line>
+    <Line Pattern="Dashed">
+      <!--Rwy23 VAPLI2.TIMJO-->
       ANPOV/EPDEX/ATVOR
     </Line>
+    <Symbol Type="SolidStar">
+      <Point>ENKUV</Point>
+    </Symbol>
     <Symbol Type="HollowTriangle">
       <Point>QN05T</Point>
       <Point>QN727</Point>
@@ -311,7 +317,6 @@
       <Point>BUGSA</Point>
       <Point>DUGAK</Point>
       <Point>QN817</Point>
-      <Point>ENKUV</Point>
       <Point>METUX</Point>
       <Point>ANPOV</Point>
       <Point>AKMAD</Point>
diff --git a/Maps/NZTG/TG_ACU.xml b/Maps/NZTG/TG_ACU.xml
index 14b67f9..1761ac7 100644
--- a/Maps/NZTG/TG_ACU.xml
+++ b/Maps/NZTG/TG_ACU.xml
@@ -58,7 +58,7 @@
   </Map>
   <Map Type="System2" Name="07 STARs" Priority="1" CustomColourName="ProcArr" Center="-37.672750+176.188389">
     <Line>
-      <!--Rwy07 BIKO1A-->
+      <!--Rwy07 BIKO2A-->
       BIKOT/BERPI/RUSTA
     </Line>
     <Line>
@@ -66,15 +66,15 @@
       FALLS/VIDOB/MORTA
     </Line>
     <Line>
-      <!--Rwy07 GOBU1A-->
+      <!--Rwy07 GOBU2A-->
       GOBUK/MORTA
     </Line>
     <Line>
-      <!--Rwy07 OLDO1A-->
-      OLDON/BATAT/MORTA
+      <!--Rwy07 OLDO2A-->
+      OLDON/MEZZO/MORTA
     </Line>
     <Line>
-      <!--Rwy07 OROP1A-->
+      <!--Rwy07 OROP2A-->
       OROPI/MORTA
     </Line>
     <Line>
@@ -82,7 +82,7 @@
       PIBOV/TODAN/MORTA
     </Line>
     <Line>
-      <!--Rwy07 URBU1A-->
+      <!--Rwy07 URBU2A-->
       URBUX/APUNO/KIMAR/RUSTA
     </Line>
     <Symbol Type="HollowTriangle">
@@ -96,7 +96,7 @@
       <Point>VIDOB</Point>
       <Point>GOBUK</Point>
       <Point>OLDON</Point>
-      <Point>BATAT</Point>
+      <Point>MEZZO</Point>
       <Point>OROPI</Point>
       <Point>PIBOV</Point>
       <Point>TODAN</Point>
@@ -203,7 +203,7 @@
   </Map>
   <Map Type="System2" Name="25 STARs" Priority="1" CustomColourName="ProcArr" Center="-37.673806+176.209056">
     <Line>
-      <!--Rwy25 BIKO1B-->
+      <!--Rwy25 BIKO2B-->
       BIKOT/BERPI/RUSTA/UBSET
     </Line>
     <Line>
@@ -215,7 +215,7 @@
       GOBUK/TODAN
     </Line>
     <Line>
-      <!--Rwy25 OLDO1B-->
+      <!--Rwy25 OLDO2B-->
       OLDON/LINPI/TODAN
     </Line>
     <Line>
@@ -227,7 +227,7 @@
       PIBOV/TODAN
     </Line>
     <Line>
-      <!--Rwy25 URBU1B-->
+      <!--Rwy25 URBU2B-->
       URBUX/APUNO/KIMAR/RUSTA
     </Line>
     <Symbol Type="HollowTriangle">
diff --git a/Maps/NZWP/WP_ACU.xml b/Maps/NZWP/WP_ACU.xml
index 4d69c40..f596740 100644
--- a/Maps/NZWP/WP_ACU.xml
+++ b/Maps/NZWP/WP_ACU.xml
@@ -179,21 +179,21 @@
     <!--Fix Symbols-->
     <Symbol Type="HollowTriangle" />
     <!--IAF Symbols-->
-    <Symbol Type="HollowTriangle" />
+    <Symbol Type="HollowTriangle">
+      <Point>WYTAK</Point>
+    </Symbol>
     <!--FAF Symbols-->
     <Symbol Type="MalteseCross">
       <Point>MESUD</Point>
     </Symbol>
     <!--IF Symbols-->
-    <Symbol Type="SolidTriangle">
-      <Point>WYTAK</Point>
-    </Symbol>
+    <Symbol Type="SolidTriangle" />
     <Line Pattern="Solid">WYTAK/MESUD/-364746.252+1743715.190</Line>
   </Map>
   <Map Type="System2" Name="03 RNP Labels" Priority="1" Center="-36.796181+174.620886" CustomColourName="ProcArr">
     <Label HasLeader="true">
-      <Point>MESUD</Point>
       <Point>WYTAK</Point>
+      <Point>MESUD</Point>
     </Label>
   </Map>
   <Map Type="System2" Name="21 SIDs" Priority="1" CustomColourName="ProcDep" Center="-36.796181+174.620886">
@@ -383,21 +383,21 @@
     <!--Fix Symbols-->
     <Symbol Type="HollowTriangle" />
     <!--IAF Symbols-->
-    <Symbol Type="HollowTriangle" />
+    <Symbol Type="HollowTriangle">
+      <Point>BAYES</Point>
+    </Symbol>
     <!--FAF Symbols-->
     <Symbol Type="MalteseCross">
       <Point>KIBIM</Point>
     </Symbol>
     <!--IF Symbols-->
-    <Symbol Type="SolidTriangle">
-      <Point>BAYES</Point>
-    </Symbol>
+    <Symbol Type="SolidTriangle" />
     <Line Pattern="Solid">BAYES/KIBIM/-364706.551+1743820.591</Line>
   </Map>
   <Map Type="System2" Name="21 RNP Labels" Priority="1" Center="-36.785153+174.639053" CustomColourName="ProcArr">
     <Label HasLeader="true">
-      <Point>KIBIM</Point>
       <Point>BAYES</Point>
+      <Point>KIBIM</Point>
     </Label>
   </Map>
   <Map Type="System2" Name="08 SIDs" Priority="1" CustomColourName="ProcDep" Center="-36.785733+174.641011">
diff --git a/Maps/NZWT/WT_ACU.xml b/Maps/NZWT/WT_ACU.xml
index ecd9801..837433b 100644
--- a/Maps/NZWT/WT_ACU.xml
+++ b/Maps/NZWT/WT_ACU.xml
@@ -29,11 +29,10 @@
   </Map>
   <Map Type="System2" Name="04 RNP" Priority="1" Center="-36.832306+175.676317" CustomColourName="ProcArr">
     <!--Fix Symbols-->
-    <Symbol Type="HollowTriangle">
-      <Point>WT423</Point>
-    </Symbol>
+    <Symbol Type="HollowTriangle" />
     <!--IAF Symbols-->
     <Symbol Type="HollowTriangle">
+      <Point>UGSAP</Point>
       <Point>IGOVU</Point>
       <Point>OLVOL</Point>
     </Symbol>
@@ -42,28 +41,25 @@
       <Point>VETUM</Point>
     </Symbol>
     <!--IF Symbols-->
-    <Symbol Type="SolidTriangle">
-      <Point>UGSAP</Point>
-    </Symbol>
+    <Symbol Type="SolidTriangle" />
     <Line Pattern="Solid">UGSAP/VETUM/WT423/-364956.302+1754034.741</Line>
     <Line Pattern="Solid">IGOVU/UGSAP</Line>
     <Line Pattern="Solid">OLVOL/UGSAP</Line>
   </Map>
   <Map Type="System2" Name="04 RNP Labels" Priority="1" Center="-36.832306+175.676317" CustomColourName="ProcArr">
     <Label HasLeader="true">
+      <Point>UGSAP</Point>
       <Point>IGOVU</Point>
       <Point>OLVOL</Point>
       <Point>VETUM</Point>
-      <Point>UGSAP</Point>
     </Label>
   </Map>
   <Map Type="System2" Name="22 RNP" Priority="1" Center="-36.825625+175.688550" CustomColourName="ProcArr">
     <!--Fix Symbols-->
-    <Symbol Type="HollowTriangle">
-      <Point>WT423</Point>
-    </Symbol>
+    <Symbol Type="HollowTriangle" />
     <!--IAF Symbols-->
     <Symbol Type="HollowTriangle">
+      <Point>UGSAP</Point>
       <Point>IGOVU</Point>
       <Point>OLVOL</Point>
     </Symbol>
@@ -72,28 +68,25 @@
       <Point>VETUM</Point>
     </Symbol>
     <!--IF Symbols-->
-    <Symbol Type="SolidTriangle">
-      <Point>UGSAP</Point>
-    </Symbol>
+    <Symbol Type="SolidTriangle" />
     <Line Pattern="Solid">UGSAP/VETUM/WT423/-364932.250+1754118.780</Line>
     <Line Pattern="Solid">IGOVU/UGSAP</Line>
     <Line Pattern="Solid">OLVOL/UGSAP</Line>
   </Map>
   <Map Type="System2" Name="22 RNP Labels" Priority="1" Center="-36.825625+175.688550" CustomColourName="ProcArr">
     <Label HasLeader="true">
+      <Point>UGSAP</Point>
       <Point>IGOVU</Point>
       <Point>OLVOL</Point>
       <Point>VETUM</Point>
-      <Point>UGSAP</Point>
     </Label>
   </Map>
   <Map Type="System2" Name="16 RNP" Priority="1" Center="-36.825436+175.679925" CustomColourName="ProcArr">
     <!--Fix Symbols-->
-    <Symbol Type="HollowTriangle">
-      <Point>WT423</Point>
-    </Symbol>
+    <Symbol Type="HollowTriangle" />
     <!--IAF Symbols-->
     <Symbol Type="HollowTriangle">
+      <Point>UGSAP</Point>
       <Point>IGOVU</Point>
       <Point>OLVOL</Point>
     </Symbol>
@@ -102,28 +95,25 @@
       <Point>VETUM</Point>
     </Symbol>
     <!--IF Symbols-->
-    <Symbol Type="SolidTriangle">
-      <Point>UGSAP</Point>
-    </Symbol>
+    <Symbol Type="SolidTriangle" />
     <Line Pattern="Solid">UGSAP/VETUM/WT423/-364931.570+1754047.730</Line>
     <Line Pattern="Solid">IGOVU/UGSAP</Line>
     <Line Pattern="Solid">OLVOL/UGSAP</Line>
   </Map>
   <Map Type="System2" Name="16 RNP Labels" Priority="1" Center="-36.825436+175.679925" CustomColourName="ProcArr">
     <Label HasLeader="true">
+      <Point>UGSAP</Point>
       <Point>IGOVU</Point>
       <Point>OLVOL</Point>
       <Point>VETUM</Point>
-      <Point>UGSAP</Point>
     </Label>
   </Map>
   <Map Type="System2" Name="34 RNP" Priority="1" Center="-36.831206+175.680208" CustomColourName="ProcArr">
     <!--Fix Symbols-->
-    <Symbol Type="HollowTriangle">
-      <Point>WT423</Point>
-    </Symbol>
+    <Symbol Type="HollowTriangle" />
     <!--IAF Symbols-->
     <Symbol Type="HollowTriangle">
+      <Point>UGSAP</Point>
       <Point>IGOVU</Point>
       <Point>OLVOL</Point>
     </Symbol>
@@ -132,19 +122,17 @@
       <Point>VETUM</Point>
     </Symbol>
     <!--IF Symbols-->
-    <Symbol Type="SolidTriangle">
-      <Point>UGSAP</Point>
-    </Symbol>
+    <Symbol Type="SolidTriangle" />
     <Line Pattern="Solid">UGSAP/VETUM/WT423/-364952.342+1754048.749</Line>
     <Line Pattern="Solid">IGOVU/UGSAP</Line>
     <Line Pattern="Solid">OLVOL/UGSAP</Line>
   </Map>
   <Map Type="System2" Name="34 RNP Labels" Priority="1" Center="-36.831206+175.680208" CustomColourName="ProcArr">
     <Label HasLeader="true">
+      <Point>UGSAP</Point>
       <Point>IGOVU</Point>
       <Point>OLVOL</Point>
       <Point>VETUM</Point>
-      <Point>UGSAP</Point>
     </Label>
   </Map>
   <Map Type="System2" Name="VFRPoint" Priority="1" CustomColourName="VFRPoint" Center="-36.831667+175.678611">
diff --git a/Profile.xml b/Profile.xml
index a493a64..00f316b 100644
--- a/Profile.xml
+++ b/Profile.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Profile Name="New Zealand" FullName="Lockheed Martin SkyLine NZZC">
-	<Version AIRAC="2306" Revision="a" PublishDate="20230615" UpdateURL="https://vatsys.sawbe.com/downloads/data/New%20Zealand/" />
+	<Version AIRAC="2308" Revision="a" PublishDate="20230811" UpdateURL="https://vatsys.sawbe.com/downloads/data/New%20Zealand/" />
 	<Servers>
 		<VATSIMStatus url="https://status.vatsim.net/" />
 		<GRIB url="http://sawbe.com/GRIB/" />
diff --git a/RestrictedAreas.xml b/RestrictedAreas.xml
index aca5577..8c1b0c3 100644
--- a/RestrictedAreas.xml
+++ b/RestrictedAreas.xml
@@ -1237,6 +1237,49 @@
         <Activation H24="true" Start="0000" End="0000" />
       </Activations>
     </RestrictedArea>
+    <RestrictedArea Type="Restricted" Name="R404 MAHIA" AltitudeFloor="0" AltitudeCeiling="13500" DAIWEnabled="true" LinePattern="Dotted">
+      <Area>
+-391407.840+1775154.740/
+-391409.207+1775214.917/
+-391413.266+1775234.482/
+-391419.894+1775252.841/
+-391428.889+1775309.436/
+-391439.980+1775323.763/
+-391452.828+1775335.387/
+-391507.044+1775343.954/
+-391522.196+1775349.205/
+-391537.824+1775350.978/
+-391553.453+1775349.219/
+-391608.608+1775343.981/
+-391622.828+1775335.423/
+-391635.681+1775323.804/
+-391646.777+1775309.476/
+-391655.778+1775252.877/
+-391702.410+1775234.509/
+-391706.472+1775214.932/
+-391707.840+1775154.740/
+-391706.472+1775134.548/
+-391702.410+1775114.971/
+-391655.778+1775056.603/
+-391646.777+1775040.004/
+-391635.681+1775025.676/
+-391622.828+1775014.057/
+-391608.608+1775005.499/
+-391553.453+1775000.261/
+-391537.824+1774958.502/
+-391522.196+1775000.275/
+-391507.044+1775005.526/
+-391452.828+1775014.093/
+-391439.980+1775025.717/
+-391428.889+1775040.044/
+-391419.894+1775056.639/
+-391413.266+1775115.000/
+-391409.207+1775134.563/
+-391407.840+1775154.740</Area>
+      <Activations>
+        <Activation H24="true" Start="0000" End="0000" />
+      </Activations>
+    </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="R501 MT BRUCE" AltitudeFloor="0" AltitudeCeiling="5000" DAIWEnabled="true" LinePattern="Dotted">
       <Area>
 -404146.600+1753815.600/
diff --git a/Sectors.xml b/Sectors.xml
index aae3e37..f677fc4 100644
--- a/Sectors.xml
+++ b/Sectors.xml
@@ -9,13 +9,13 @@
     <ResponsibleSectors>TGS,HTMA</ResponsibleSectors>
   </Sector>
   <Sector FullName="Christchurch Director" Frequency="129.200" Callsign="NZCH-D_CTR" Name="NZCH-D" />
-  <Sector FullName="Faleolo Control" Frequency="126.900" Callsign="NSFA_CTR" Name="FCTR" />
+  <Sector FullName="Faleolo Control" Frequency="126.900" Callsign="NSFA_CTR" Name="FCTR" DisplayInHandoffWindow="False" />
   <Sector FullName="Kaikoura" Frequency="129.400" Callsign="NZCH-K_CTR" Name="KAI">
     <Volumes>KAI</Volumes>
     <ResponsibleSectors>CTMA</ResponsibleSectors>
   </Sector>
-  <Sector FullName="NCRG_CTR" Frequency="118.900" Callsign="NCRG_CTR" Name="DummyName" />
-  <Sector FullName="NTTC_CTR" Frequency="134.700" Callsign="NTTC_CTR" Name="DummyName" />
+  <Sector FullName="NCRG_CTR" Frequency="118.900" Callsign="NCRG_CTR" Name="Rarotonga Control" DisplayInHandoffWindow="False" />
+  <Sector FullName="NTTC_CTR" Frequency="134.700" Callsign="NTTC_CTR" Name="Tahiti Control" DisplayInHandoffWindow="False" />
   <Sector FullName="Oceanic Radar" Frequency="123.900" Callsign="NZAA_CTR" Name="OCR">
     <Volumes>OCR</Volumes>
     <ResponsibleSectors>BAY,RAN,ATMA</ResponsibleSectors>
@@ -32,19 +32,31 @@
     <Volumes>NAK</Volumes>
     <ResponsibleSectors>OHA,TNS,WTMA</ResponsibleSectors>
   </Sector>
-  <Sector FullName="Auckland Radio" Frequency="129.000" Callsign="NZZO_FSS" Name="ARO" />
-  <Sector FullName="Auckland Radio (East)" Frequency="131.500" Callsign="NZZO-E_FSS" Name="ARE" />
-  <Sector FullName="BN-INS_FSS" Frequency="129.250" Callsign="BN-INS_FSS" Name="DummyName" />
-  <Sector FullName="Brisbane Radio (Coral)" Frequency="133.150" Callsign="BN-COL_FSS" Name="COL" />
-  <Sector FullName="Brisbane Radio (Flinders)" Frequency="132.850" Callsign="BN-FLD_FSS" Name="FLD" />
-  <Sector FullName="Brisbane Radio (Howe)" Frequency="124.950" Callsign="BN-HWE_FSS" Name="HWE" />
-  <Sector FullName="Brisbane Radio (Tasman)" Frequency="124.650" Callsign="BN-TSN_FSS" Name="BRO" />
-  <Sector FullName="Mac Centre" Frequency="128.700" Callsign="NZCM_FSS" Name="MAC" />
-  <Sector FullName="Melbourne Radio (Indian)" Frequency="129.250" Callsign="ML-IND_FSS" Name="IND" />
-  <Sector FullName="Nadi Oceanic" Frequency="123.600" Callsign="NFFF_FSS" Name="NFFF" />
-  <Sector FullName="Oakland East" Frequency="131.950" Callsign="ZAK-E_FSS" Name="KZKE" />
-  <Sector FullName="Oakland West" Frequency="122.500" Callsign="ZAK-W_FSS" Name="KZKW" />
-  <Sector FullName="Tahiti Radio" Frequency="125.500" Callsign="NTTT_FSS" Name="TRDO" />
+  <Sector FullName="Auckland Radio" Frequency="129.000" Callsign="NZZO_FSS" Name="ARO" DisplayInSectorsWindow="False">
+    <Volumes>ARO</Volumes>
+    <ResponsibleSectors>ARE,ART</ResponsibleSectors>
+  </Sector>
+  <Sector FullName="Auckland Radio (East)" Frequency="131.500" Callsign="NZZO-E_FSS" Name="ARE" DisplayInSectorsWindow="False">
+    <Volumes>ARE</Volumes>
+  </Sector>
+  <Sector FullName="Auckland Radio (Tasman)" Frequency="129.500" Callsign="NZZO-TSN_FSS" Name="ART" DisplayInSectorsWindow="False">
+    <Volumes>ART</Volumes>
+  </Sector>
+  <Sector FullName="Brisbane Radio (Coral)" Frequency="133.150" Callsign="BN-COL_FSS" Name="COL" DisplayInHandoffWindow="False" />
+  <Sector FullName="Brisbane Radio (Flinders)" Frequency="132.850" Callsign="BN-FLD_FSS" Name="FLD" DisplayInHandoffWindow="False" />
+  <Sector FullName="Brisbane Radio (Howe)" Frequency="124.950" Callsign="BN-HWE_FSS" Name="HWE" DisplayInHandoffWindow="False" />
+  <Sector FullName="Brisbane Radio (Tasman)" Frequency="124.650" Callsign="BN-TSN_FSS" Name="BRO" DisplayInHandoffWindow="False" />
+  <Sector FullName="Mac Centre" Frequency="128.700" Callsign="NZCM_FSS" Name="MAC" DisplayInHandoffWindow="False" />
+  <Sector FullName="Melbourne Radio (Indian South)" Frequency="129.250" Callsign="ML-INS_FSS" Name="INS" DisplayInHandoffWindow="False" />
+  <Sector FullName="Melbourne Radio (Indian)" Frequency="129.250" Callsign="ML-IND_FSS" Name="IND" DisplayInHandoffWindow="False" />
+  <Sector FullName="Nadi Oceanic" Frequency="123.600" Callsign="NFFF_FSS" Name="NFFF" DisplayInHandoffWindow="False" />
+  <Sector FullName="San Francisco Radio" Frequency="131.950" Callsign="ZAK-E_FSS" Name="KZKE" DisplayInHandoffWindow="False" />
+  <Sector FullName="San Francisco Radio" Frequency="122.500" Callsign="ZAK-W_FSS" Name="KZKW" DisplayInHandoffWindow="False" />
+  <Sector FullName="Tahiti Radio" Frequency="125.500" Callsign="NTTT_FSS" Name="TRDO" DisplayInHandoffWindow="False" />
+  <Sector FullName="San Francisco Radio" Frequency="131.950" Callsign="ZAK_FSS" Name="ZAK" DisplayInHandoffWindow="False" />
+  <Sector FullName="San Francisco Radio" Frequency="131.950" Callsign="ZAK-E1_FSS" Name="ZAKE1" DisplayInHandoffWindow="False" />
+  <Sector FullName="San Francisco Radio" Frequency="122.500" Callsign="ZAK-W1_FSS" Name="ZAKW1" DisplayInHandoffWindow="False" />
+  <Sector FullName="San Francisco Radio" Frequency="122.500" Callsign="ZAK-W2_FSS" Name="ZAKW2" DisplayInHandoffWindow="False" />
   <Sector FullName="Auckland Approach" Frequency="124.300" Callsign="NZAA_APP" Name="ATMA">
     <Volumes>ATMA</Volumes>
     <ResponsibleSectors>AARR,ADEP</ResponsibleSectors>
@@ -62,9 +74,9 @@
   <Sector FullName="Christchurch Departures" Frequency="120.900" Callsign="NZCH_DEP" Name="CDEP">
     <Volumes>CTMA</Volumes>
   </Sector>
-  <Sector FullName="NCRG_APP" Frequency="118.100" Callsign="NCRG_APP" Name="DummyName" />
-  <Sector FullName="NFTF_APP" Frequency="118.500" Callsign="NFTF_APP" Name="DummyName" />
-  <Sector FullName="NTAA_APP" Frequency="121.300" Callsign="NTAA_APP" Name="DummyName" />
+  <Sector FullName="NCRG_APP" Frequency="118.100" Callsign="NCRG_APP" Name="DummyName" DisplayInHandoffWindow="False" />
+  <Sector FullName="NFTF_APP" Frequency="118.500" Callsign="NFTF_APP" Name="DummyName" DisplayInHandoffWindow="False" />
+  <Sector FullName="NTAA_APP" Frequency="121.300" Callsign="NTAA_APP" Name="DummyName" DisplayInHandoffWindow="False" />
   <Sector FullName="Ohakea Approach" Frequency="125.100" Callsign="NZOH_APP" Name="OTMA">
     <Volumes>OTMA</Volumes>
   </Sector>
@@ -78,64 +90,64 @@
   <Sector FullName="Wellington Departures" Frequency="122.300" Callsign="NZWN_DEP" Name="WDEP">
     <Volumes>WTMA</Volumes>
   </Sector>
-  <Sector FullName="Auckland Delivery" Frequency="128.200" Callsign="NZAA_DEL" Name="DAA" />
-  <Sector FullName="Auckland Ground" Frequency="121.900" Callsign="NZAA_GND" Name="GAA" />
-  <Sector FullName="Auckland Tower" Frequency="118.700" Callsign="NZAA_TWR" Name="TAA" />
-  <Sector FullName="Christchurch Delivery" Frequency="128.200" Callsign="NZCH_DEL" Name="DCH" />
-  <Sector FullName="Christchurch Ground" Frequency="121.900" Callsign="NZCH_GND" Name="GCH" />
-  <Sector FullName="Christchurch Tower" Frequency="118.400" Callsign="NZCH_TWR" Name="TCH" />
+  <Sector FullName="Auckland Delivery" Frequency="128.200" Callsign="NZAA_DEL" Name="DAA" DisplayInHandoffWindow="False" />
+  <Sector FullName="Auckland Ground" Frequency="121.900" Callsign="NZAA_GND" Name="GAA" DisplayInHandoffWindow="False" />
+  <Sector FullName="Auckland Tower" Frequency="118.700" Callsign="NZAA_TWR" Name="TAA" DisplayInHandoffWindow="False" />
+  <Sector FullName="Christchurch Delivery" Frequency="128.200" Callsign="NZCH_DEL" Name="DCH" DisplayInHandoffWindow="False" />
+  <Sector FullName="Christchurch Ground" Frequency="121.900" Callsign="NZCH_GND" Name="GCH" DisplayInHandoffWindow="False" />
+  <Sector FullName="Christchurch Tower" Frequency="118.400" Callsign="NZCH_TWR" Name="TCH" DisplayInHandoffWindow="False" />
   <Sector FullName="Dunedin Tower" Frequency="120.700" Callsign="NZDN_TWR" Name="TDN">
     <Volumes>TDN</Volumes>
   </Sector>
   <Sector FullName="Gisborne Tower" Frequency="127.300" Callsign="NZGS_TWR" Name="TGS">
     <Volumes>TGS</Volumes>
   </Sector>
-  <Sector FullName="Hamilton Delivery" Frequency="122.900" Callsign="NZHN_DEL" Name="DHN" />
-  <Sector FullName="Hamilton Tower" Frequency="126.800" Callsign="NZHN_TWR" Name="THN" />
+  <Sector FullName="Hamilton Delivery" Frequency="122.900" Callsign="NZHN_DEL" Name="DHN" DisplayInHandoffWindow="False" />
+  <Sector FullName="Hamilton Tower" Frequency="126.800" Callsign="NZHN_TWR" Name="THN" DisplayInHandoffWindow="False" />
   <Sector FullName="Invercargill Tower" Frequency="118.500" Callsign="NZNV_TWR" Name="TNV">
     <Volumes>TNV</Volumes>
   </Sector>
-  <Sector FullName="Milford Sound FIS" Frequency="118.200" Callsign="NZMF_TWR" Name="MFS">
+  <Sector FullName="Milford Sound FIS" Frequency="118.200" Callsign="NZMF_TWR" Name="MFS" DisplayInHandoffWindow="False">
     <Volumes>MFFIS</Volumes>
   </Sector>
   <Sector FullName="Napier Tower" Frequency="124.800" Callsign="NZNR_TWR" Name="TNR">
     <Volumes>TNR</Volumes>
   </Sector>
-  <Sector FullName="NCRG_DEL" Frequency="121.900" Callsign="NCRG_DEL" Name="DummyName" />
-  <Sector FullName="Nelson Delivery" Frequency="123.300" Callsign="NZNS_DEL" Name="DNS" />
+  <Sector FullName="NCRG_DEL" Frequency="121.900" Callsign="NCRG_DEL" Name="DummyName" DisplayInHandoffWindow="False" />
+  <Sector FullName="Nelson Delivery" Frequency="123.300" Callsign="NZNS_DEL" Name="DNS" DisplayInHandoffWindow="False" />
   <Sector FullName="Nelson Tower" Frequency="127.400" Callsign="NZNS_TWR" Name="TNS">
     <Volumes>TNS</Volumes>
   </Sector>
   <Sector FullName="New Plymouth Tower" Frequency="124.700" Callsign="NZNP_TWR" Name="TNP">
     <Volumes>TNP</Volumes>
   </Sector>
-  <Sector FullName="NFTF_GND" Frequency="121.900" Callsign="NFTF_GND" Name="DummyName" />
-  <Sector FullName="NFTV_GND" Frequency="121.900" Callsign="NFTV_GND" Name="DummyName" />
-  <Sector FullName="NFTV_TWR" Frequency="118.100" Callsign="NFTV_TWR" Name="DummyName" />
-  <Sector FullName="NIUE_TWR" Frequency="118.100" Callsign="NIUE_TWR" Name="DummyName" />
-  <Sector FullName="NSFA_TWR" Frequency="118.100" Callsign="NSFA_TWR" Name="DummyName" />
-  <Sector FullName="NSTU_TWR" Frequency="122.900" Callsign="NSTU_TWR" Name="DummyName" />
-  <Sector FullName="NTAA_GND" Frequency="121.900" Callsign="NTAA_GND" Name="DummyName" />
-  <Sector FullName="NTAA_TWR" Frequency="118.100" Callsign="NTAA_TWR" Name="DummyName" />
-  <Sector FullName="NTTB_TWR" Frequency="118.900" Callsign="NTTB_TWR" Name="DummyName" />
-  <Sector FullName="NTTM_TWR" Frequency="118.700" Callsign="NTTM_TWR" Name="DummyName" />
-  <Sector FullName="NTTR_TWR" Frequency="118.500" Callsign="NTTR_TWR" Name="DummyName" />
-  <Sector FullName="NZWD_TWR" Frequency="126.200" Callsign="NZWD_TWR" Name="DummyName" />
-  <Sector FullName="Ohakea Ground" Frequency="122.100" Callsign="NZOH_GND" Name="GOH" />
-  <Sector FullName="Ohakea Tower" Frequency="134.500" Callsign="NZOH_TWR" Name="TOH" />
-  <Sector FullName="Palmerston North Ground" Frequency="121.700" Callsign="NZPM_GND" Name="GPM" />
-  <Sector FullName="Palmerston North Tower" Frequency="120.600" Callsign="NZPM_TWR" Name="TPM" />
-  <Sector FullName="Paraparaumu FIS" Frequency="118.300" Callsign="NZPP_TWR" Name="PFS">
+  <Sector FullName="NFTF_GND" Frequency="121.900" Callsign="NFTF_GND" Name="DummyName" DisplayInHandoffWindow="False" />
+  <Sector FullName="NFTV_GND" Frequency="121.900" Callsign="NFTV_GND" Name="DummyName" DisplayInHandoffWindow="False" />
+  <Sector FullName="NFTV_TWR" Frequency="118.100" Callsign="NFTV_TWR" Name="DummyName" DisplayInHandoffWindow="False" />
+  <Sector FullName="NIUE_TWR" Frequency="118.100" Callsign="NIUE_TWR" Name="DummyName" DisplayInHandoffWindow="False" />
+  <Sector FullName="NSFA_TWR" Frequency="118.100" Callsign="NSFA_TWR" Name="DummyName" DisplayInHandoffWindow="False" />
+  <Sector FullName="NSTU_TWR" Frequency="122.900" Callsign="NSTU_TWR" Name="DummyName" DisplayInHandoffWindow="False" />
+  <Sector FullName="NTAA_GND" Frequency="121.900" Callsign="NTAA_GND" Name="DummyName" DisplayInHandoffWindow="False" />
+  <Sector FullName="NTAA_TWR" Frequency="118.100" Callsign="NTAA_TWR" Name="DummyName" DisplayInHandoffWindow="False" />
+  <Sector FullName="NTTB_TWR" Frequency="118.900" Callsign="NTTB_TWR" Name="DummyName" DisplayInHandoffWindow="False" />
+  <Sector FullName="NTTM_TWR" Frequency="118.700" Callsign="NTTM_TWR" Name="DummyName" DisplayInHandoffWindow="False" />
+  <Sector FullName="NTTR_TWR" Frequency="118.500" Callsign="NTTR_TWR" Name="DummyName" DisplayInHandoffWindow="False" />
+  <Sector FullName="NZWD_TWR" Frequency="126.200" Callsign="NZWD_TWR" Name="DummyName" DisplayInHandoffWindow="False" />
+  <Sector FullName="Ohakea Ground" Frequency="122.100" Callsign="NZOH_GND" Name="GOH" DisplayInHandoffWindow="False" />
+  <Sector FullName="Ohakea Tower" Frequency="134.500" Callsign="NZOH_TWR" Name="TOH" DisplayInHandoffWindow="False" />
+  <Sector FullName="Palmerston North Ground" Frequency="121.700" Callsign="NZPM_GND" Name="GPM" DisplayInHandoffWindow="False" />
+  <Sector FullName="Palmerston North Tower" Frequency="120.600" Callsign="NZPM_TWR" Name="TPM" DisplayInHandoffWindow="False" />
+  <Sector FullName="Paraparaumu FIS" Frequency="118.300" Callsign="NZPP_TWR" Name="PFS" DisplayInHandoffWindow="False">
     <Volumes>PPFIS</Volumes>
   </Sector>
-  <Sector FullName="Queenstown Delivery" Frequency="121.900" Callsign="NZQN_DEL" Name="DQN" />
-  <Sector FullName="Queenstown Ground" Frequency="128.300" Callsign="NZQN_GND" Name="GQN" />
-  <Sector FullName="Queenstown Tower" Frequency="118.100" Callsign="NZQN_TWR" Name="TQN" />
-  <Sector FullName="Rotorua Tower" Frequency="121.200" Callsign="NZRO_TWR" Name="TRO" />
-  <Sector FullName="Tauranga Tower" Frequency="118.300" Callsign="NZTG_TWR" Name="TTG" />
-  <Sector FullName="Wellington Delivery" Frequency="128.200" Callsign="NZWN_DEL" Name="DWN" />
-  <Sector FullName="Wellington Ground" Frequency="121.900" Callsign="NZWN_GND" Name="GWN" />
-  <Sector FullName="Wellington Tower" Frequency="118.800" Callsign="NZWN_TWR" Name="TWN" />
-  <Sector FullName="Whenuapai Tower" Frequency="134.500" Callsign="NZWP_TWR" Name="TWP" />
-  <Sector FullName="Woodbourne Tower" Frequency="118.100" Callsign="NZWB_TWR" Name="TWB" />
+  <Sector FullName="Queenstown Delivery" Frequency="121.900" Callsign="NZQN_DEL" Name="DQN" DisplayInHandoffWindow="False" />
+  <Sector FullName="Queenstown Ground" Frequency="128.300" Callsign="NZQN_GND" Name="GQN" DisplayInHandoffWindow="False" />
+  <Sector FullName="Queenstown Tower" Frequency="118.100" Callsign="NZQN_TWR" Name="TQN" DisplayInHandoffWindow="False" />
+  <Sector FullName="Rotorua Tower" Frequency="121.200" Callsign="NZRO_TWR" Name="TRO" DisplayInHandoffWindow="False" />
+  <Sector FullName="Tauranga Tower" Frequency="118.300" Callsign="NZTG_TWR" Name="TTG" DisplayInHandoffWindow="False" />
+  <Sector FullName="Wellington Delivery" Frequency="128.200" Callsign="NZWN_DEL" Name="DWN" DisplayInHandoffWindow="False" />
+  <Sector FullName="Wellington Ground" Frequency="121.900" Callsign="NZWN_GND" Name="GWN" DisplayInHandoffWindow="False" />
+  <Sector FullName="Wellington Tower" Frequency="118.800" Callsign="NZWN_TWR" Name="TWN" DisplayInHandoffWindow="False" />
+  <Sector FullName="Whenuapai Tower" Frequency="134.500" Callsign="NZWP_TWR" Name="TWP" DisplayInHandoffWindow="False" />
+  <Sector FullName="Woodbourne Tower" Frequency="118.100" Callsign="NZWB_TWR" Name="TWB" DisplayInHandoffWindow="False" />
 </Sectors>
\ No newline at end of file
diff --git a/Volumes.xml b/Volumes.xml
index 6c12d3f..5035d78 100644
--- a/Volumes.xml
+++ b/Volumes.xml
@@ -1,6 +1,88 @@
 <?xml version="1.0"?>
 <Volumes>
 
+  <!-- Oceanic Sectors -->
+  <Boundary Name="NZZO">
+    -30.000000-131.000000/
+    -90.000000-131.000000/
+    -30.000000+163.000000/
+    -28.000000+168.000000/
+    -25.000000+171.416667/
+    -25.000000+180.000000/
+    -15.545861-175.675333/
+    -05.000000-171.000000/
+    -05.000000-157.000000/
+    -30.000000-157.000000/
+    -30.000000-131.000000
+  </Boundary>
+
+  <Boundary Name="NZCM">
+    -90.000000+163.000000/
+    -90.000000-131.000000/
+    -60.000000-131.000000/
+    -60.000000+163.000000/
+    -90.000000+163.000000
+  </Boundary>
+
+  <Boundary Name="NZZT">
+    -45.916665+165.300000/
+    -45.000000+163.000000/
+    -30.000000+163.000000/
+    -34.251980+172.499500/
+    -34.612703+171.950242/
+    -34.820882+171.703517/
+    -35.045484+171.478532/
+    -35.284932+171.277041/
+    -35.537530+171.100675/
+    -35.801476+170.950927/
+    -36.074870+170.829139/
+    -36.355724+170.736485/
+    -36.641977+170.673959/
+    -36.931505+170.642358/
+    -37.222137+170.642272/
+    -37.511669+170.674066/
+    -37.797878+170.737864/
+    -38.078543+170.833544/
+    -38.351459+170.960720/
+    -38.614454+171.118738/
+    -38.865414+171.306666/
+    -39.102295+171.523290/
+    -39.127231+171.556106/
+    -39.370303+171.284912/
+    -39.608780+171.069659/
+    -39.860481+170.880706/
+    -40.123629+170.719676/
+    -40.396348+170.588038/
+    -40.676673+170.487097/
+    -40.962559+170.417975/
+    -41.251896+170.381596/
+    -41.424168+170.390000/
+    -41.566667+170.243057/
+    -42.821388+168.913304/
+    -42.825504+168.525307/
+    -42.849296+168.269652/
+    -42.888768+168.017501/
+    -42.943649+167.770587/
+    -43.013563+167.530617/
+    -43.098028+167.299267/
+    -43.196460+167.078169/
+    -43.308176+166.868907/
+    -43.432396+166.673004/
+    -43.568250+166.491917/
+    -43.714781+166.327023/
+    -43.870947+166.179612/
+    -44.035633+166.050876/
+    -44.207652+165.941899/
+    -44.385755+165.853646/
+    -44.568638+165.786954/
+    -44.754948+165.742520/
+    -44.943298+165.720890/
+    -45.132267+165.722453/
+    -45.320419+165.747427/
+    -45.503612+165.811942/
+    -45.916665+165.300000
+  </Boundary>
+
   <!-- Enroute Sectors -->
   <Boundary Name="BAYS">
     -36.991944+175.752778/
@@ -982,6 +1064,22 @@
   </Boundary>
 
   <!-- Volume to Boundary Association -->
+  <Volume Name="ARO" LowerLimit="24500" UpperLimit="60000">
+    <Boundaries>NZZO</Boundaries>
+  </Volume>
+
+  <Volume Name="ARE" LowerLimit="24500" UpperLimit="60000">
+    <Boundaries>NZZO</Boundaries>
+  </Volume>
+
+  <Volume Name="MAC" LowerLimit="24500" UpperLimit="60000">
+    <Boundaries>NZCM</Boundaries>
+  </Volume>
+
+  <Volume Name="ART" LowerLimit="24500" UpperLimit="60000">
+    <Boundaries>NZZT</Boundaries>
+  </Volume>
+
   <Volume Name="BAY" LowerLimit="0" UpperLimit="60000">
     <Boundaries>BAYS</Boundaries>
   </Volume>