diff --git a/FIRBoundaries.dat b/FIRBoundaries.dat
index c35bdea1..29db85f4 100644
--- a/FIRBoundaries.dat
+++ b/FIRBoundaries.dat
@@ -5544,7 +5544,7 @@ EYVL|0|0|135|53.891264|18.018611|56.445997|26.85625|55.168631|22.43743
 55.2457|21.276489
 55.281667|20.956667
 55.373333|20.643333
-FAJO|0|0|18|-90.0|-10.0|-18.0|75.0|-45.0|32.5
+FAJO|0|0|19|-90.0|-10.0|-18.0|75.0|-45.0|32.5
 -20.0|-10.0
 -18.0|-5.0
 -18.0|10.0
@@ -5563,6 +5563,7 @@ FAJO|0|0|18|-90.0|-10.0|-18.0|75.0|-45.0|32.5
 -46.0|-10.0
 -39.0|-10.0
 -34.0|-10.0
+-32.933334|-10.0
 FACA|0|0|31|-37.0|15.0|-30.5|32.0|-33.25|23.5
 -34.83|15.0
 -32.67|15.0
@@ -6389,7 +6390,7 @@ FMMM|0|0|10|-30.0|40.0|-10.0|57.0|-20.0|48.5
 -15.0|43.0
 -11.001717|41.50025
 -10.301769|44.000975
-FNAN|0|0|73|-20.0|-10.0|-4.166667|24.333122|-12.083334|7.166666
+FNAN|0|0|75|-20.0|-10.0|-4.166667|24.333122|-12.083334|7.166666
 -4.166667|6.583333
 -5.5|8.833333
 -5.083333|12.0
@@ -6460,6 +6461,8 @@ FNAN|0|0|73|-20.0|-10.0|-4.166667|24.333122|-12.083334|7.166666
 -18.0|10.0
 -18.0|-5.0
 -20.0|-10.0
+-17.450833|-10.0
+-15.856667|-10.0
 -12.0|-10.0
 -9.533333|-3.0
 -5.866667|6.583333
@@ -8486,7 +8489,7 @@ HUEC|0|0|98|-1.489544|29.577886|3.996925|35.034114|1.25369|32.306
 0.113925|33.900756
 -0.144386|33.967425
 -0.502686|33.909092
-KZAB|0|0|64|28.916667|-114.0|37.5|-100.0|33.208334|-107.0
+KZAB|0|0|65|28.916667|-114.0|37.5|-100.0|33.208334|-107.0
 35.766667|-111.841667
 35.7|-110.233333
 36.033333|-108.216667
@@ -8541,6 +8544,7 @@ KZAB|0|0|64|28.916667|-114.0|37.5|-100.0|33.208334|-107.0
 31.783333|-108.216667
 31.35|-108.216667
 31.333333|-108.21666
+31.333333|-108.5
 31.333333|-111.1
 32.1|-113.508333
 32.7375|-113.684722
@@ -9154,49 +9158,49 @@ PHZH|0|0|16|17.0|-164.0|26.2|-150.0|21.6|-157.0
 21.733333|-151.078333
 20.868333|-150.536667
 KZAK|0|0|16|0.0|130.0|49.274395|180.0|28.0|-160.0
-21.0|130.0
-7.0|130.0
-3.999222|132.001353
-4.000506|132.571677
-3.5|133.0
-3.5|141.0
-0.0|141.0
-0.0|160.0
-3.5|160.0
-3.5|180.0
-49.274395|180.0
-45.7|162.916667
-43.0|165.0
-27.0|165.0
-27.0|155.0
 21.0|155.0
+27.0|155.0
+27.0|165.0
+43.0|165.0
+45.7|162.916667
+49.274395|180.0
+3.5|180.0
+3.5|160.0
+0.0|160.0
+0.0|141.0
+3.5|141.0
+3.5|133.0
+4.000506|132.571677
+3.999222|132.001353
+7.0|130.0
+21.0|130.0
 KZAK|0|1|26|-5.0|-180.0|56.761667|-120.0|0.0|0.0
-56.0|-153.0
-53.5|-160.0
-51.4|-167.816667
-50.133333|-176.566667
-50.216667|-177.1
-49.274395|-180.0
-3.5|-180.0
--5.0|-180.0
--5.0|-155.0
-3.5|-145.0
-3.5|-120.0
-30.0|-120.0
-30.75|-120.833333
-34.5|-123.25
-35.993|-124.2015
-35.500833|-127.0
-38.804166|-127.0
-39.99|-127.0
-40.983333|-126.9
-45.0|-126.5
-48.166667|-127.925
-48.333333|-128.0
-51.0|-133.75
-54.0|-136.0
-53.3675|-137.0
 56.761667|-151.75
+53.3675|-137.0
+54.0|-136.0
+51.0|-133.75
+48.333333|-128.0
+48.166667|-127.925
+45.0|-126.5
+40.983333|-126.9
+39.99|-127.0
+38.804166|-127.0
+35.500833|-127.0
+35.993|-124.2015
+34.5|-123.25
+30.75|-120.833333
+30.0|-120.0
+3.5|-120.0
+3.5|-145.0
+-5.0|-155.0
+-5.0|-180.0
+3.5|-180.0
+49.274395|-180.0
+50.216667|-177.1
+50.133333|-176.566667
+51.4|-167.816667
+53.5|-160.0
+56.0|-153.0
 KZOA|0|0|27|34.5|-127.0|41.333333|-117.008333|37.916667|-122.004167
 40.216667|-125.333333
 40.216667|-123.833333
@@ -9332,7 +9336,7 @@ KZKC|0|0|29|35.458333|-102.55|40.783333|-88.094444|38.120833|-95.322222
 35.829167|-100.0
 36.5|-101.75
 37.5|-102.55
-KZLA|0|0|40|30.75|-123.25|38.016667|-111.504167|34.383334|-117.377084
+KZLA|0|0|35|30.75|-123.25|38.016667|-111.504167|34.383334|-117.377084
 34.5|-123.25
 35.533333|-120.85
 35.75|-120.116667
@@ -9364,13 +9368,8 @@ KZLA|0|0|40|30.75|-123.25|38.016667|-111.504167|34.383334|-117.377084
 32.683333|-114.0
 32.7375|-113.684722
 32.1|-113.508333
-32.25|-114.0
 32.491667|-114.81111
 32.718611|-114.718611
-32.7|-115.08333
-32.679167|-115.25833
-32.633333|-115.91666
-32.6|-116.3
 32.534167|-117.123611
 30.75|-120.833333
 KZMP|0|0|39|39.466667|-103.166667|49.0|-82.185556|44.233334|-92.676112
@@ -9451,7 +9450,7 @@ KZLC|0|0|37|37.4125|-119.5|49.0|-103.166667|43.20625|-111.333334
 45.333333|-117.75
 45.333333|-115.0
 48.416667|-115.0
-KZHU|1|0|16|24.0|-95.916667|28.25|-84.993167|26.125|-90.958334
+KZHU|1|0|14|24.0|-95.916667|28.25|-84.993167|26.125|-90.958334
 26.0|-95.916667
 27.533333|-95.15
 28.25|-94.0
@@ -9465,8 +9464,6 @@ KZHU|1|0|16|24.0|-95.916667|28.25|-84.993167|26.125|-90.958334
 24.0|-84.993167
 24.0|-86.0
 24.5|-88.0
-24.500428|-89.23339
-24.500425|-91.82235
 24.5|-93.0
 KZHU|0|0|61|25.841667|-102.558333|32.283333|-87.4|29.0625|-94.979167
 29.766667|-102.558333
@@ -9816,9 +9813,10 @@ LBSR|0|0|122|41.240958|22.365128|44.211886|30.75|42.8|26.2
 41.402822|23.301781
 41.376461|23.235311
 41.322372|23.210394
-LCCC|0|0|34|31.827319|30.0|36.083333|35.708333|33.9573|33.229451
+LCCC|0|0|35|31.827319|30.0|36.083333|35.708333|33.9573|33.229451
 33.5|30.0
 36.083333|30.0
+35.944833|33.159667
 35.916667|33.55
 35.916667|35.666667
 35.883333|35.6
@@ -10642,7 +10640,7 @@ LFRR|0|0|19|43.583333|-8.0|50.396235|3.018101|48.0|-1.6
 48.120895|1.782472
 47.576393|1.640554
 47.166667|1.475466
-LGGG|0|0|149|33.5|19.0|41.74485|30.0|36.7|24.55
+LGGG|0|0|151|33.5|19.0|41.74485|30.0|36.7|24.55
 41.706222|26.362361
 41.566667|26.55
 41.366667|26.583333
@@ -10660,6 +10658,7 @@ LGGG|0|0|149|33.5|19.0|41.74485|30.0|36.7|24.55
 38.666667|26.316667
 38.483333|26.35
 38.3|26.183333
+38.247|26.1695
 38.216667|26.2
 38.183333|26.233333
 38.0|26.5
@@ -10680,6 +10679,7 @@ LGGG|0|0|149|33.5|19.0|41.74485|30.0|36.7|24.55
 36.7|27.933333
 36.516667|27.966667
 36.566667|28.3
+36.334167|28.666
 36.216667|28.883333
 36.1|29.25
 36.183333|29.383333
@@ -11000,7 +11000,7 @@ LGGG-W|0|0|34|34.0|19.0|40.434192|25.5|39.24576|21.010782
 35.333333|24.0
 35.266667|25.0
 34.0|25.5
-LGGG-E|0|0|37|33.5|22.962|38.247|30.0|36.264344|27.000707
+LGGG-E|0|0|38|33.5|22.962|38.247|30.0|36.264344|27.000707
 37.848667|24.302
 37.932833|24.6555
 38.247|26.1695
@@ -11023,6 +11023,7 @@ LGGG-E|0|0|37|33.5|22.962|38.247|30.0|36.264344|27.000707
 36.7|27.933333
 36.516667|27.966667
 36.566667|28.3
+36.334167|28.666
 36.216667|28.883333
 36.1|29.25
 36.183333|29.383333
@@ -12882,7 +12883,7 @@ LSAS|0|0|85|45.816667|5.95|47.883333|10.483333|46.85|8.216667
 46.583333|6.108333
 46.783333|6.458333
 46.925|6.433
-LTAA|0|0|139|35.775|25.6|42.8|44.799908|39.2875|37.399954
+LTAA|0|0|142|35.775|25.6|42.8|44.799908|39.2875|37.399954
 42.116667|29.0
 42.8|30.75
 42.8|31.0
@@ -12971,12 +12972,14 @@ LTAA|0|0|139|35.775|25.6|42.8|44.799908|39.2875|37.399954
 35.9|35.933333
 35.916667|35.666667
 35.916667|33.55
+35.944833|33.159667
 36.083333|30.0
 36.066667|29.733333
 36.183333|29.583333
 36.183333|29.383333
 36.1|29.25
 36.216667|28.883333
+36.334167|28.666
 36.566667|28.3
 36.516667|27.966667
 36.7|27.933333
@@ -12997,6 +13000,7 @@ LTAA|0|0|139|35.775|25.6|42.8|44.799908|39.2875|37.399954
 38.0|26.5
 38.183333|26.233333
 38.216667|26.2
+38.247|26.1695
 38.3|26.183333
 38.483333|26.35
 38.666667|26.316667
@@ -13022,7 +13026,7 @@ LTAA|0|0|139|35.775|25.6|42.8|44.799908|39.2875|37.399954
 41.996389|27.851389
 41.983333|28.033333
 41.983333|28.316667
-LTBB|0|0|56|36.066667|25.6|42.8|31.0|39.433334|28.3
+LTBB|0|0|58|36.066667|25.6|42.8|31.0|39.433334|28.3
 42.116667|29.0
 42.8|30.75
 42.8|31.0
@@ -13034,6 +13038,7 @@ LTBB|0|0|56|36.066667|25.6|42.8|31.0|39.433334|28.3
 36.183333|29.383333
 36.1|29.25
 36.216667|28.883333
+36.334167|28.666
 36.566667|28.3
 36.516667|27.966667
 36.7|27.933333
@@ -13054,6 +13059,7 @@ LTBB|0|0|56|36.066667|25.6|42.8|31.0|39.433334|28.3
 38.0|26.5
 38.183333|26.233333
 38.216667|26.2
+38.247|26.1695
 38.3|26.183333
 38.483333|26.35
 38.666667|26.316667
@@ -14153,13 +14159,13 @@ MHCC|0|0|57|1.416667|-104.5|20.733333|-82.0|11.075|-93.25
 13.0|-95.0
 14.55|-92.233333
 14.666667|-92.183333
-14.850844|-92.20013
+14.85|-92.2
 15.018413|-92.133658
 15.084167|-92.08346
 15.250825|-92.23346
 16.084119|-91.75011
 16.083333|-90.466667
-16.234114|-90.46675
+16.233333|-90.466667
 16.384106|-90.41675
 16.466667|-90.666667
 16.650761|-90.70009
@@ -14293,7 +14299,7 @@ MTEG|0|0|26|17.0|-75.0|20.416667|-71.633333|18.708334|-73.316667
 18.033333|-71.758333
 17.0|-71.666667
 17.0|-73.0
-MUFH|0|0|13|18.5|-86.0|24.0|-73.333333|21.25|-79.666666
+MUFH|0|0|12|18.5|-86.0|24.0|-73.333333|21.25|-79.666666
 24.0|-86.0
 24.0|-83.166667
 24.0|-78.0
@@ -14305,7 +14311,6 @@ MUFH|0|0|13|18.5|-86.0|24.0|-73.333333|21.25|-79.666666
 20.0|-78.333333
 20.0|-82.0
 20.733333|-85.35
-21.649431|-85.81857
 22.0|-86.0
 MYNN|0|0|16|20.0|-79.0|27.024421|-70.457985|23.2|-75
 27.0|-78.883333
@@ -14364,12 +14369,12 @@ NFFF|0|0|16|-33.266667|161.25|3.5|180.0|-13.250000|175.00000
 -28.0|168.0
 -25.0|171.416667
 -25.0|180.0
-NFFF|0|1|4|-25.0|180.0|-5.0|188.833333|-13.250000|2.446850
+NFFF|0|1|4|-25.0|-180.0|-5.0|-171.166667|-13.250000|175.00000
 -5.0|-180.0
 -25.0|-180.0
 -13.918889|-175.106389
 -5.0|-171.166667
-NFFN|0|0|26|-20.330824|174.818729|-15.254722|181.731667|-19.035672|179.828924
+NFFN|0|0|24|-20.327559|174.818729|-15.254722|180.0|-19.035672|179.828924
 -15.254722|177.928889
 -15.256352|177.443863
 -15.256389|177.443611
@@ -14392,10 +14397,15 @@ NFFN|0|0|26|-20.330824|174.818729|-15.254722|181.731667|-19.035672|179.828924
 -20.21785|176.981128
 -20.256389|177.443611
 -20.256339|177.443673
--20.330824|180.11306
--20.2675|180.2
--19.166667|181.731667
--15.294722|181.731667
+-20.327559|180.0
+-15.276333|180.0
+NFFN|0|1|6|-20.330824|-180.0|-15.276333|-178.268333|-19.035672|179.828924
+-15.276333|-180.0
+-20.327559|-180.0
+-20.330824|-179.88694
+-20.2675|-179.8
+-19.166667|-178.268333
+-15.294722|-178.268333
 NVVV|0|0|4|-21.0|163.0|-13.0|170.5|-15.500000|168.500000
 -14.0|163.0
 -21.0|170.5
@@ -14413,6 +14423,14 @@ NSFA|0|0|4|-25.0|-180.0|-5.0|-157.0|-15.0|-167.0
 -5.0|-157.0
 -25.0|-157.0
 -25.0|-180.0
+NWWW|0|0|7|-24.0|161.25|-14.0|170.5|-18.500000|165.250000
+-14.0|161.25
+-16.971389|162.6625
+-17.666667|163.0
+-24.0|163.0
+-24.0|170.5
+-21.0|170.5
+-14.0|163.0
 NZZO|0|0|8|-60.0|-180.0|-5.0|-131.0|-40.0|-170.0
 -30.0|-131.0
 -60.0|-131.0
@@ -15068,7 +15086,7 @@ OERD|0|0|76|22.804317|34.758056|32.153889|50.909167|27.498221|43.543168
 28.099444|36.7975
 28.362631|35.853157
 28.692778|34.758056
-TEH-1N|0|0|43|37.2075|44.01655|39.783333|48.875|38.225913|46.812884
+TEH-1N|0|0|44|37.2075|44.01655|39.783333|48.875|38.225913|46.812884
 38.632414|44.299892
 38.649083|44.249892
 38.815753|44.283225
@@ -15080,6 +15098,7 @@ TEH-1N|0|0|43|37.2075|44.01655|39.783333|48.875|38.225913|46.812884
 39.415767|44.383228
 39.682439|44.449894
 39.783333|44.7
+39.714169|44.769085
 39.5|44.95
 39.4|45.0
 39.216667|45.166667
@@ -15477,7 +15496,7 @@ TEH-7|0|0|68|32.972419|51.283778|38.283333|61.266667|35.808468|56.735832
 37.186944|52.338889
 37.7|52.398611
 37.35|53.916667
-OIIX|0|0|194|24.661311|44.01655|39.783333|63.305011|32.225446|53.691667
+OIIX|0|0|195|24.661311|44.01655|39.783333|63.305011|32.225446|53.691667
 34.317683|60.683031
 34.101019|60.466369
 33.734358|60.533036
@@ -15600,6 +15619,7 @@ OIIX|0|0|194|24.661311|44.01655|39.783333|63.305011|32.225446|53.691667
 39.415767|44.383228
 39.682439|44.449894
 39.783333|44.7
+39.714169|44.769085
 39.5|44.95
 39.4|45.0
 39.216667|45.166667
@@ -21399,7 +21419,7 @@ WSJC|0|0|39|-0.833333|102.166667|10.5|116.5|4.833334|109.333334
 3.666667|103.666667
 4.833333|103.733333
 6.75|102.666667
-ZBPE|0|0|75|32.125|105.229167|45.434694|120.0|40.09172|113.29524
+ZBPE|0|0|74|32.125|105.229167|45.434694|120.0|40.09172|113.29524
 45.388056|115.354167
 43.245|117.516667
 42.25|118.083333
@@ -21422,7 +21442,6 @@ ZBPE|0|0|75|32.125|105.229167|45.434694|120.0|40.09172|113.29524
 37.466667|110.733333
 38.366667|110.6
 38.733333|109.683333
-39.113333|109.042778
 39.433333|108.5
 40.311667|107.003333
 40.716667|105.916667
@@ -21475,33 +21494,14 @@ ZBPE|0|0|75|32.125|105.229167|45.434694|120.0|40.09172|113.29524
 45.208319|114.456972
 45.389431|114.545264
 45.434694|114.763619
-ZBAA|0|0|13|36.316667|113.293333|42.25|120.0|39.02789|116.64389
-40.1|113.293333
-40.256944|113.884722
-41.333333|114.516667
-42.185|116.475
+ZBAA|0|0|74|32.125|105.229167|45.434694|120.0|39.02789|116.64389
+45.388056|115.354167
+43.245|117.516667
 42.25|118.083333
 39.9|119.35
 39.5|119.866667
 38.25|120.0
 38.116667|119.55
-37.486667|117.5
-36.666667|115.4
-36.316667|114.5
-38.316667|114.083333
-ZBAA|0|1|80|32.125|105.229167|45.434694|119.696667|39.02789|116.64389
-45.388056|115.354167
-43.245|117.516667
-42.25|118.083333
-42.185|116.475
-41.333333|114.516667
-40.256944|113.884722
-40.1|113.293333
-38.316667|114.083333
-36.316667|114.5
-36.666667|115.4
-37.486667|117.5
-38.116667|119.55
 37.623333|119.696667
 36.645|119.121667
 36.202778|119.183889
@@ -21517,7 +21517,6 @@ ZBAA|0|1|80|32.125|105.229167|45.434694|119.696667|39.02789|116.64389
 37.466667|110.733333
 38.366667|110.6
 38.733333|109.683333
-39.113333|109.042778
 39.433333|108.5
 40.311667|107.003333
 40.716667|105.916667
@@ -21570,9 +21569,8 @@ ZBAA|0|1|80|32.125|105.229167|45.434694|119.696667|39.02789|116.64389
 45.208319|114.456972
 45.389431|114.545264
 45.434694|114.763619
-ZBHH|0|0|62|38.733333|105.229167|45.434694|118.083333|42.01505|112.43802
+ZBHH|0|0|61|38.733333|105.229167|45.434694|118.083333|42.01505|112.43802
 38.733333|109.683333
-39.113333|109.042778
 39.433333|108.5
 40.311667|107.003333
 40.716667|105.916667
@@ -21672,9 +21670,9 @@ ZBLA|0|0|122|46.07|115.54805|53.5|123.065|48.75674|119.47633
 48.895403|116.0868
 49.833333|116.7
 49.7|117.0
-49.633333|117.283333
-49.633333|117.466667
-49.5|117.866667
+49.633333|117.28333
+49.633333|117.46666
+49.5|117.86666
 49.766667|118.36666
 49.816667|118.38333
 49.95|118.66666
@@ -21699,23 +21697,23 @@ ZBLA|0|0|122|46.07|115.54805|53.5|123.065|48.75674|119.47633
 51.366667|119.93333
 51.566667|120.05
 51.633333|120.08333
-51.683333|120.083333
+51.683333|120.08333
 51.666667|120.16666
 51.833333|120.46666
 51.866667|120.55
 51.916667|120.65
-52.0|120.716667
-52.033333|120.683333
-52.166667|120.783333
+52.0|120.71666
+52.033333|120.68333
+52.166667|120.78333
 52.25|120.75
-52.316667|120.633333
-52.35|120.616667
+52.316667|120.63333
+52.35|120.61666
 52.366667|120.65
-52.533333|120.733333
+52.533333|120.73333
 52.583333|120.6
 52.633333|120.45
 52.616667|120.4
-52.616667|120.266667
+52.616667|120.26666
 52.583333|120.18333
 52.583333|120.06666
 52.683333|120.03333
@@ -21768,15 +21766,10 @@ ZBYN|0|0|11|34.533333|109.683333|40.1|114.5|37.375556|112.606667
 36.316667|114.5
 36.066667|113.81
 35.749722|113.008611
-ZGZU|0|0|129|20.5|105.541667|33.533333|117.5|25.276667|111.34
+ZGZU|0|0|127|20.5|105.541667|33.533333|117.5|25.279167|111.341667
 23.195833|105.541667
 24.65|105.8
-25.171667|106.718333
-25.373611|107.073056
 25.7|107.65
-25.715|107.678333
-26.096668|108.396666
-26.43|109.026667
 26.583333|109.316667
 28.783333|109.383333
 29.516667|109.4
@@ -21787,8 +21780,11 @@ ZGZU|0|0|129|20.5|105.541667|33.533333|117.5|25.276667|111.34
 30.083333|115.933333
 29.033333|114.566667
 26.7|113.95
-26.05|114.116667
-25.766667|114.873333
+26.855|114.713333
+26.796667|115.266667
+26.666389|115.469167
+26.501667|115.708333
+26.104167|116.032222
 25.091667|115.416667
 24.766667|115.016667
 24.366667|116.7
@@ -21898,7 +21894,7 @@ ZGZU|0|0|129|20.5|105.541667|33.533333|117.5|25.276667|111.34
 23.083333|105.65
 23.066667|105.583333
 23.166667|105.566667
-ZGZU|0|1|9|25.091667|113.95|26.855|116.032222|26.23955|115.01155
+ZSHA-AR22|0|0|9|25.091667|113.95|26.855|116.032222|26.23955|115.01155
 26.05|114.116667
 26.7|113.95
 26.855|114.713333
@@ -21908,8 +21904,16 @@ ZGZU|0|1|9|25.091667|113.95|26.855|116.032222|26.23955|115.01155
 26.104167|116.032222
 25.091667|115.416667
 25.766667|114.873333
-ZSHA-AR22|0|0|9|25.091667|113.95|26.855|116.032222|26.23955|115.01155
-26.05|114.116667
+ZGGG|0|0|89|20.5|107.65|33.533333|117.5|23.8925|113.798889
+26.583333|109.316667
+28.783333|109.383333
+29.516667|109.4
+31.9|109.516667
+33.533333|110.866667
+32.125|114.07
+32.908333|115.813333
+30.083333|115.933333
+29.033333|114.566667
 26.7|113.95
 26.855|114.713333
 26.796667|115.266667
@@ -21917,29 +21921,6 @@ ZSHA-AR22|0|0|9|25.091667|113.95|26.855|116.032222|26.23955|115.01155
 26.501667|115.708333
 26.104167|116.032222
 25.091667|115.416667
-25.766667|114.873333
-ZGGG|0|0|69|21.57|110.55|26.05|117.5|23.8925|113.798889
-21.57|111.826667
-21.846668|111.508334
-22.016666|111.31
-22.468334|110.785
-22.86|110.55
-23.35|111.148333
-23.478333|111.306667
-24.148333|111.266667
-24.355|111.28
-24.463335|111.286666
-24.576668|111.295
-25.276667|111.34
-25.456667|111.988333
-25.561667|112.358333
-25.75|113.04
-25.868333|113.463334
-25.941666|113.7
-26.018334|114.001667
-26.05|114.116667
-25.766667|114.873333
-25.091667|115.416667
 24.766667|115.016667
 24.366667|116.7
 23.7|117.183333
@@ -21988,42 +21969,6 @@ ZGGG|0|0|69|21.57|110.55|26.05|117.5|23.8925|113.798889
 21.65|112.3
 21.666667|112.2
 21.733333|112.116667
-ZGGG|0|1|55|20.5|107.65|33.533333|116.032222|23.8925|113.798889
-26.583333|109.316667
-28.783333|109.383333
-29.516667|109.4
-31.9|109.516667
-33.533333|110.866667
-32.125|114.07
-32.908333|115.813333
-30.083333|115.933333
-29.033333|114.566667
-26.7|113.95
-26.855|114.713333
-26.796667|115.266667
-26.666389|115.469167
-26.501667|115.708333
-26.104167|116.032222
-25.091667|115.416667
-25.766667|114.873333
-26.05|114.116667
-26.018334|114.001667
-25.941666|113.7
-25.868333|113.463334
-25.75|113.04
-25.561667|112.358333
-25.456667|111.988333
-25.276667|111.34
-24.576668|111.295
-24.463335|111.286666
-24.355|111.28
-24.148333|111.266667
-23.478333|111.306667
-23.35|111.148333
-22.86|110.55
-22.468334|110.785
-22.016666|111.31
-21.846668|111.508334
 21.57|111.826667
 21.475|111.683333
 21.416667|111.5
@@ -22037,6 +21982,11 @@ ZGGG|0|1|55|20.5|107.65|33.533333|116.032222|23.8925|113.798889
 22.505|109.47
 22.488333|110.005
 22.486668|110.14
+22.468334|110.785
+22.86|110.55
+23.35|111.148333
+23.478333|111.306667
+24.15|111.2716667
 24.128334|110.185
 24.45|109.983333
 24.668333|109.84
@@ -22044,7 +21994,7 @@ ZGGG|0|1|55|20.5|107.65|33.533333|116.032222|23.8925|113.798889
 25.715|107.678333
 26.096668|108.396666
 26.43|109.026667
-ZGHA|0|0|28|25.276667|109.316667|29.516667|114.566667|27.866667|111.520834
+ZGHA|0|0|24|25.279167|109.316667|29.516667|114.566667|27.866667|111.520834
 26.583333|109.316667
 27.8825|109.355834
 28.783333|109.383333
@@ -22067,42 +22017,31 @@ ZGHA|0|0|28|25.276667|109.316667|29.516667|114.566667|27.866667|111.520834
 25.75|113.04
 25.561667|112.358333
 25.456667|111.988333
-25.276667|111.34
-25.621666|110.813333
-25.666668|110.736666
-25.751665|110.608333
-26.373335|109.643333
-26.536665|109.388334
-ZGKL|0|0|18|24.128334|107.65|26.583333|111.34|25.366667|109.3
+25.279167|111.341667
+26.266667|109.730556
+ZGNN-AR08|0|0|11|24.128334|107.65|26.583333|111.341667|25.366667|109.3
 25.7|107.65
 25.715|107.678333
 26.096668|108.396666
 26.43|109.026667
 26.583333|109.316667
-26.536665|109.388334
-26.373335|109.643333
-25.751665|110.608333
-25.666668|110.736666
-25.621666|110.813333
-25.276667|111.34
-24.576668|111.295
-24.463335|111.286666
-24.355|111.28
-24.148333|111.266667
+26.266667|109.730556
+25.279167|111.341667
+24.15|111.2716667
 24.128334|110.185
 24.45|109.983333
 24.668333|109.84
-ZGNN|0|0|77|20.5|105.541667|25.7|111.306667|23.366667|108.0
+ZGNN|0|0|78|20.5|105.541667|26.583333|111.341667|23.366667|108.0
 23.195833|105.541667
 24.103333|105.703333
 24.65|105.8
 25.171667|106.718333
 25.373611|107.073056
 25.7|107.65
-24.668333|109.84
-24.45|109.983333
-24.128334|110.185
-24.148333|111.266667
+26.583333|109.316667
+26.266667|109.730556
+25.279167|111.341667
+24.15|111.271667
 23.478333|111.306667
 23.35|111.148333
 22.86|110.55
@@ -22117,6 +22056,7 @@ ZGNN|0|0|77|20.5|105.541667|25.7|111.306667|23.366667|108.0
 21.0|108.8
 20.5|109.25
 20.5|108.0
+21.178409|108.0
 21.533333|108.0
 21.533333|107.966667
 21.65|107.85
@@ -22232,16 +22172,36 @@ ZHHH|0|0|12|29.033333|109.4|33.533333|115.933333|30.5|112.650833
 31.9|109.516667
 33.533333|110.866667
 32.125|114.07
-ZJSY|0|0|8|17.666667|107.189722|20.5|111.5|19.08253|109.57186
-20.5|108.0
-20.5|111.5
+ZJSY|0|0|28|14.5|107.189722|22.505|114.0|19.08253|109.57186
 19.5|111.5
-17.666667|109.666667
+16.666667|114.0
+14.5|114.0
+14.5|112.0
+15.688784|110.661053
+16.012552|110.296388
+17.433407|108.696057
 17.666667|108.433333
 18.341111|107.681389
 19.267778|107.189722
 19.959167|107.929722
-ZJSY|0|1|25|14.5|108.433333|22.505|114.0|19.08253|109.57186
+20.5|108.0
+20.5|109.25
+21.0|108.8
+21.63|108.97
+21.85|109.095
+22.051112|109.21
+22.281667|109.341667
+22.505|109.47
+22.488333|110.005
+22.486668|110.14
+22.468334|110.785
+22.016666|111.31
+21.846668|111.508334
+21.57|111.826667
+21.475|111.683333
+21.416667|111.5
+20.5|111.5
+ZJSA-OCA|0|0|9|14.5|108.433333|19.5|114.0|17.28511|111.29363
 19.5|111.5
 16.666667|114.0
 14.5|114.0
@@ -22251,23 +22211,7 @@ ZJSY|0|1|25|14.5|108.433333|22.505|114.0|19.08253|109.57186
 17.433407|108.696057
 17.666667|108.433333
 17.666667|109.666667
-20.5|111.5
-21.416667|111.5
-21.475|111.683333
-21.57|111.826667
-21.846668|111.508334
-22.016666|111.31
-22.468334|110.785
-22.486668|110.14
-22.488333|110.005
-22.505|109.47
-22.281667|109.341667
-22.051112|109.21
-21.85|109.095
-21.63|108.97
-21.0|108.8
-20.5|109.25
-ZJSA|0|0|28|14.5|107.189722|22.505|114.0|17.28511|111.29363
+ZJSA|0|0|28|14.5|107.189722|22.505|114.0|18.41011|110.40915
 19.5|111.5
 16.666667|114.0
 14.5|114.0
@@ -22296,12 +22240,16 @@ ZJSA|0|0|28|14.5|107.189722|22.505|114.0|17.28511|111.29363
 21.475|111.683333
 21.416667|111.5
 20.5|111.5
-ZLLL|0|0|31|31.816667|87.383333|42.916667|105.05|37.12123|95.43824
+ZLLL|0|0|35|31.816667|87.383333|42.916667|109.042778|37.12123|95.43824
 41.55|105.05
-38.0|101.365556
-37.62|101.0
-36.791667|99.083333
-34.251944|102.945833
+41.7475|105.229167
+40.716667|105.916667
+40.311667|107.003333
+39.113333|109.042778
+37.311389|107.678889
+35.49|106.333333
+34.891667|106.85
+32.45|105.816667
 33.583333|103.883333
 32.916667|101.7
 31.816667|98.583333
@@ -22328,28 +22276,11 @@ ZLLL|0|0|31|31.816667|87.383333|42.916667|105.05|37.12123|95.43824
 41.883333|104.55
 41.666667|104.533333
 41.633333|104.95
-ZLLL|0|1|15|32.45|99.083333|41.7475|109.042778|36.60685|104.9444
-39.113333|109.042778
-37.311389|107.678889
-35.49|106.333333
-34.891667|106.85
-32.45|105.816667
-33.583333|103.883333
-34.251944|102.945833
-36.791667|99.083333
-37.62|101.0
-38.0|101.365556
-41.55|105.05
+ZLHW|0|0|41|31.816667|87.383333|42.916667|110.866667|38.2979|101.62578
 41.7475|105.229167
 40.716667|105.916667
 40.311667|107.003333
 39.433333|108.5
-ZLHW|0|0|42|31.816667|87.383333|42.916667|110.866667|38.2979|101.62578
-41.7475|105.229167
-40.716667|105.916667
-40.311667|107.003333
-39.433333|108.5
-39.113333|109.042778
 38.733333|109.683333
 38.366667|110.6
 37.466667|110.733333
@@ -22387,7 +22318,7 @@ ZLHW|0|0|42|31.816667|87.383333|42.916667|110.866667|38.2979|101.62578
 41.666667|104.533333
 41.633333|104.95
 41.55|105.05
-ZLXY-H|0|0|15|32.45|99.083333|41.7475|109.042778|36.60685|104.9444
+ZLXY-H|0|0|14|32.45|99.083333|41.7475|109.042778|36.60685|104.9444
 39.113333|109.042778
 37.311389|107.678889
 35.49|106.333333
@@ -22402,12 +22333,17 @@ ZLXY-H|0|0|15|32.45|99.083333|41.7475|109.042778|36.60685|104.9444
 41.7475|105.229167
 40.716667|105.916667
 40.311667|107.003333
-39.433333|108.5
-ZLXY|0|0|15|31.9|105.816667|39.113333|110.866667|34.65427|108.67186
+ZLXY|0|0|21|31.9|99.083333|41.7475|110.866667|34.65427|108.67186
 32.45|105.816667
-34.891667|106.85
-35.49|106.333333
-37.311389|107.678889
+33.583333|103.883333
+34.251944|102.945833
+36.791667|99.083333
+37.62|101.0
+38.0|101.365556
+41.55|105.05
+41.7475|105.229167
+40.716667|105.916667
+40.311667|107.003333
 39.113333|109.042778
 38.733333|109.683333
 38.366667|110.6
@@ -22419,22 +22355,6 @@ ZLXY|0|0|15|31.9|105.816667|39.113333|110.866667|34.65427|108.67186
 31.9|109.516667
 31.981389|109.0
 32.233333|107.4
-ZLXY|0|1|15|32.45|99.083333|41.7475|109.042778|36.60685|104.9444
-39.113333|109.042778
-37.311389|107.678889
-35.49|106.333333
-34.891667|106.85
-32.45|105.816667
-33.583333|103.883333
-34.251944|102.945833
-36.791667|99.083333
-37.62|101.0
-38.0|101.365556
-41.55|105.05
-41.7475|105.229167
-40.716667|105.916667
-40.311667|107.003333
-39.433333|108.5
 ZPPP|0|0|215|21.15|97.55|28.516667|105.8|24.42727|102.06528
 23.195833|105.541667
 23.2|105.5
@@ -22651,7 +22571,7 @@ ZPPP|0|0|215|21.15|97.55|28.516667|105.8|24.42727|102.06528
 27.6|105.416667
 26.95|104.816667
 24.65|105.8
-ZPKM|0|0|332|21.15|81.625|36.416667|109.516667|29.91873|98.69726
+ZPKM|0|0|327|21.15|81.625|36.416667|109.516667|29.91873|98.69726
 36.416667|87.383333
 36.033333|89.016667
 32.866667|91.916667
@@ -22665,12 +22585,7 @@ ZPKM|0|0|332|21.15|81.625|36.416667|109.516667|29.91873|98.69726
 29.516667|109.4
 28.783333|109.383333
 26.583333|109.316667
-26.43|109.026667
-26.096668|108.396666
-25.715|107.678333
 25.7|107.65
-25.373611|107.073056
-25.171667|106.718333
 24.65|105.8
 23.195833|105.541667
 23.2|105.5
@@ -23095,21 +23010,20 @@ ZULS|0|0|110|27.325164|81.625|36.416667|97.583333|30.75362|90.11675
 30.016642|82.514628
 30.099961|82.247997
 30.349936|82.164669
-ZUGY|0|0|11|24.65|104.816667|28.783333|109.383333|26.78015|107.28488
+ZUGY|0|0|6|24.65|104.816667|28.783333|109.383333|26.78015|107.28488
 28.783333|109.383333
 26.583333|109.316667
-26.43|109.026667
-26.096668|108.396666
-25.715|107.678333
 25.7|107.65
-25.373611|107.073056
-25.171667|106.718333
 24.65|105.8
 26.95|104.816667
 27.6|105.416667
-ZUUU|0|0|16|26.886667|97.0|33.583333|109.516667|29.83459|103.65367
+ZUUU|0|0|20|24.65|97.0|33.583333|109.516667|29.83459|103.65367
 29.516667|109.4
 28.783333|109.383333
+26.583333|109.316667
+25.7|107.65
+24.65|105.8
+26.95|104.816667
 27.6|105.416667
 27.75|103.883333
 26.886667|102.108333
@@ -23124,35 +23038,10 @@ ZUUU|0|0|16|26.886667|97.0|33.583333|109.516667|29.83459|103.65367
 32.45|105.816667
 32.233333|107.4
 31.9|109.516667
-ZUUU|0|1|11|24.65|104.816667|28.783333|109.383333|26.78015|107.28488
-28.783333|109.383333
-26.583333|109.316667
-26.43|109.026667
-26.096668|108.396666
-25.715|107.678333
-25.7|107.65
-25.373611|107.073056
-25.171667|106.718333
-24.65|105.8
-26.95|104.816667
-27.6|105.416667
-ZSSS|0|0|15|26.473783|117.278333|35.091667|124.0|30.89823|120.21437
+ZSSS|0|0|23|23.0|113.95|35.091667|124.0|30.89823|120.21437
 35.0|124.0
 29.0|124.0
 26.473783|121.473435
-27.92|118.531667
-28.445|117.963333
-29.736667|118.253333
-30.951667|118.753333
-31.57|118.7
-31.652778|118.1
-31.716667|118.105
-32.666667|117.881667
-34.061667|117.548333
-34.733333|117.278333
-35.091667|119.34
-35.0|120.0
-ZSSS|0|1|28|23.0|113.95|34.733333|121.473435|30.89823|120.21437
 25.0|120.0
 23.0|117.5
 23.5|117.5
@@ -23171,16 +23060,8 @@ ZSSS|0|1|28|23.0|113.95|34.733333|121.473435|30.89823|120.21437
 32.908333|115.813333
 34.516667|115.908333
 34.733333|117.278333
-34.061667|117.548333
-32.666667|117.881667
-31.716667|118.105
-31.652778|118.1
-31.57|118.7
-30.951667|118.753333
-29.736667|118.253333
-28.445|117.963333
-27.92|118.531667
-26.473783|121.473435
+35.091667|119.34
+35.0|120.0
 ZSHA|0|0|28|23.0|113.95|38.25|124.0|29.37925|118.17084
 29.0|124.0
 26.473783|121.473435
@@ -23271,7 +23152,7 @@ ZSQD|0|0|13|35.0|119.121667|38.25|124.0|36.79607|121.89935
 36.645|119.121667
 37.623333|119.696667
 38.116667|119.55
-ZWWW|0|0|101|38.143333|79.833|49.183333|96.337222|42.98516|88.53638
+ZWWW|0|0|271|30.05|73.6|49.183333|96.337222|42.98516|88.53638
 42.216667|80.25
 42.283333|80.283333
 42.766667|80.233333
@@ -23371,9 +23252,8 @@ ZWWW|0|0|101|38.143333|79.833|49.183333|96.337222|42.98516|88.53638
 42.916667|96.337222
 41.8|95.133333
 38.35|90.216667
-38.143333|85.516667
-41.713333|82.965
-ZWWW|0|1|176|30.05|73.6|42.216667|90.216667|36.67571|81.1109
+36.416667|87.383333
+32.301667|84.055
 30.441667|81.625
 30.45|81.583333
 30.383333|81.566667
@@ -23544,12 +23424,6 @@ ZWWW|0|1|176|30.05|73.6|42.216667|90.216667|36.67571|81.1109
 41.916667|79.783333
 42.066667|79.866667
 42.066667|80.283333
-42.216667|80.25
-41.713333|82.965
-38.143333|85.516667
-38.35|90.216667
-36.416667|87.383333
-32.301667|84.055
 ZWUQ|0|0|271|30.05|73.6|49.183333|96.337222|39.77188|84.3564
 42.916667|96.337222
 41.8|95.133333
@@ -23999,7 +23873,7 @@ ZWAK|0|0|176|30.05|73.6|42.216667|90.216667|36.67571|81.1109
 38.35|90.216667
 36.416667|87.383333
 32.301667|84.055
-ZYTX|0|0|127|39.828056|115.354167|46.768597|131.31666|42.59123|122.46231
+ZYTX|0|0|345|39.828056|115.354167|53.55|134.76666|42.59123|122.46231
 44.051667|131.29666
 44.016667|131.25
 43.883333|131.25
@@ -24122,12 +23996,9 @@ ZYTX|0|0|127|39.828056|115.354167|46.768597|131.31666|42.59123|122.46231
 46.5986|119.7075
 46.615278|119.7675
 46.07|122.073333
-44.81|123.075
-44.251667|124.391667
-43.771667|125.849167
-43.877778|126.282222
-43.623333|127.283333
-ZYTX|0|1|230|43.623333|122.073333|53.55|134.76666|46.74231|127.27081
+48.52|123.065
+50.276667|122.771667
+50.63|123.036667
 53.5|122.333333
 53.433333|122.4
 53.466667|122.48333
@@ -24348,17 +24219,7 @@ ZYTX|0|1|230|43.623333|122.073333|53.55|134.76666|46.74231|127.27081
 44.916667|131.08333
 44.833333|130.96666
 44.7|131.08333
-44.051667|131.29666
-43.623333|127.283333
-43.877778|126.282222
-43.771667|125.849167
-44.251667|124.391667
-44.81|123.075
-46.07|122.073333
-48.52|123.065
-50.276667|122.771667
-50.63|123.036667
-ZYSH|0|0|460|38.0|115.354167|53.55|134.76666|44.83988|123.03321
+ZYSH|0|0|465|36.623889|115.354167|53.55|134.76666|44.83988|123.03321
 49.833333|116.7
 49.7|117.0
 49.633333|117.283333
@@ -24745,7 +24606,12 @@ ZYSH|0|0|460|38.0|115.354167|53.55|134.76666|44.83988|123.03321
 40.0|124.35
 39.828056|124.16833
 38.0|124.0
-38.25|123.0
+36.625556|124.0
+36.623889|123.668056
+37.015556|123.133056
+37.475278|123.12
+38.123889|122.284444
+38.25|122.215833
 38.25|120.0
 39.5|119.86666
 39.9|119.35
@@ -24819,15 +24685,6 @@ ZYSH|0|0|460|38.0|115.354167|53.55|134.76666|44.83988|123.03321
 48.529467|115.81917
 48.815833|116.08417
 48.895403|116.0868
-ZYSH|0|1|8|36.623889|122.215833|38.25|124.0|37.50938|123.49129
-38.25|122.215833
-38.25|123.0
-38.0|124.0
-36.625556|124.0
-36.623889|123.668056
-37.015556|123.133056
-37.475278|123.12
-38.123889|122.284444
 ZYHB|0|0|230|43.623333|122.073333|53.55|134.76666|46.74231|127.27081
 53.5|122.333333
 53.433333|122.4
@@ -25059,33 +24916,20 @@ ZYHB|0|0|230|43.623333|122.073333|53.55|134.76666|46.74231|127.27081
 48.52|123.065
 50.276667|122.771667
 50.63|123.036667
-ZYTL|0|0|7|38.0|119.35|40.263333|124.16833|39.20652|121.73851
-38.0|124.0
-38.25|123.0
-38.25|120.0
-39.5|119.866667
-39.9|119.35
-40.263333|122.191667
-39.828056|124.16833
-ZYTL|0|1|8|36.623889|122.215833|38.25|124.0|37.50938|123.49129
-38.25|122.215833
-38.25|123.0
+ZYTL|0|0|12|36.623889|119.35|40.263333|124.16833|39.20652|121.73851
 38.0|124.0
 36.625556|124.0
 36.623889|123.668056
 37.015556|123.133056
 37.475278|123.12
 38.123889|122.284444
-ZYTL-AR03|0|0|8|36.623889|122.215833|38.25|124.0|37.50938|123.49129
 38.25|122.215833
-38.123889|122.284444
-37.475278|123.12
-37.015556|123.133056
-36.623889|123.668056
-36.625556|124.0
-38.0|124.0
-38.25|123.0
-ZYTL-AR03|0|1|8|36.623889|122.215833|38.25|124.0|37.50938|123.49129
+38.25|120.0
+39.5|119.866667
+39.9|119.35
+40.263333|122.191667
+39.828056|124.16833
+ZYTL-AR03|0|0|8|36.623889|122.215833|38.25|124.0|37.50938|123.49129
 38.25|122.215833
 38.123889|122.284444
 37.475278|123.12
@@ -25233,15 +25077,17 @@ PAZA|0|0|23|49.274395|-180.0|90.0|-131.8|61.066666|-165.9
 61.366666|-177.751666
 62.583333|-175.0
 65.0|-168.973056
-PAZA|0|1|8|45.7|159.0|60.0|180.0|0.0|0.0
+PAZA|0|1|10|45.7|159.0|60.0|180.0|0.0|0.0
 54.0|169.0
 54.678333|170.0
 54.816667|170.2
 54.677778|170.0
+54.816667|170.2
 60.0|180.0
 49.274395|180.0
 45.7|162.916667
 50.083333|159.0
+54.0|169.0
 PGZU|0|0|71|9.378055|140.555799|17.711388|149.127534|11.8|144.795983
 13.544721|149.127534
 14.268256|149.062423
@@ -25408,25 +25254,30 @@ LUUU|0|0|55|45.473333|26.832686|48.445|29.816667|46.959166|29.0
 48.216667|26.883333
 48.232608|26.832686
 48.293333|27.1
-MMEX|0|0|16|13.450908|-106.0|23.666667|-95.0002|18.56|-100.5
-23.666667|-102.83333
-23.449342|-100.23396
-23.363792|-99.34699
+MMEX|0|0|21|13.036944|-107.7625|24.1525|-95.0|18.739215|-100.78432
+23.666667|-102.8333
+23.603056|-101.9663
+23.509444|-100.7925
+23.458333|-100.2294
+23.438056|-100.0136
+23.294167|-98.5575
+23.026667|-96.2177
 23.0|-96.0
-23.000481|-95.00021
-20.151989|-95.0002
-19.483961|-95.0002
-14.926394|-96.58607
-13.450908|-97.08358
-15.0|-105.0
+22.41028|-95.0
+19.490833|-95.0
+18.484167|-95.315
+18.408611|-95.3386
+13.878333|-96.7116
+13.036944|-99.4944
+15.335556|-105.2822
 16.183333|-106.0
-19.171667|-104.77361
-20.859714|-105.53687
-20.717778|-103.65083
-20.855833|-103.32194
-21.904397|-103.6071
-MMID|0|0|46|11.5|-105.0|24.500428|-85.283333|17.0|-93.0
-17.811264|-90.97843
+18.223889|-107.7625
+21.625833|-105.5641
+22.285556|-105.1216
+22.690556|-104.8513
+24.1525|-103.4355
+MMID|0|0|46|11.5|-105.2822|24.5|-85.283333|18.965712|-92.447442
+17.810556|-90.978333
 17.25|-91.016667
 17.25|-91.466667
 17.184069|-91.41677
@@ -25435,71 +25286,70 @@ MMID|0|0|46|11.5|-105.0|24.500428|-85.283333|17.0|-93.0
 16.650761|-90.70009
 16.466667|-90.666667
 16.384106|-90.41675
-16.234114|-90.46675
+16.233333|-90.466667
 16.083333|-90.466667
-16.084119|-91.75011
+16.083333|-91.75
 15.250825|-92.23346
 15.084167|-92.08346
-15.017503|-92.13346
-14.850844|-92.20013
+15.018413|-92.133658
+14.85|-92.2
 14.666667|-92.183333
 14.55|-92.233333
 13.0|-95.0
 11.5|-100.0
 15.0|-105.0
-13.450908|-97.08358
-14.926394|-96.58607
-19.483961|-95.0002
-20.151989|-95.0002
-23.000481|-95.00021
+15.335556|-105.2822
+13.036944|-99.4944
+13.878333|-96.7116
+18.408611|-95.3386
+18.484167|-95.315
+19.490833|-95.0
+22.41028|-95.0
+23.0|-95.0
 24.5|-93.0
-24.500425|-91.82235
-24.500428|-89.23339
 24.5|-88.0
 24.0|-86.0
 22.0|-86.0
-21.649431|-85.81857
 20.733333|-85.35
 20.183333|-85.283333
-20.000611|-85.99996
+20.0|-86.0
 19.333333|-86.633333
 18.15|-87.75
 18.15|-88.033333
 18.417347|-88.03335
-18.484011|-88.31669
-18.484011|-88.48336
-17.850706|-88.83337
-18.0007|-89.03338
-17.950703|-89.15005
+18.483333|-88.316667
+18.483333|-88.483333
+17.85|-88.833333
+18.0|-89.033333
+17.95|-89.15
 17.816667|-89.15
-MMTY|0|0|71|23.0|-108.5|31.783333|-93.0|27.39|-102.75
-31.333333|-108.21666
-31.35|-108.216667
+MMTY|0|0|76|22.41028|-108.5|31.783333|-93.0|27.39|-102.75
+31.333333|-108.216667
 31.783333|-108.216667
 31.7832|-107.388
 31.783333|-106.53333
 31.75|-106.5
-31.733333|-106.38333
+31.733333|-106.383333
 31.466667|-106.2
 31.383333|-106.0
 31.0|-105.55
-30.833333|-105.31666
-30.683333|-104.98333
-30.366667|-104.83333
-30.15|-104.68333
+30.833333|-105.316667
+30.683333|-104.983333
+30.366667|-104.833333
+30.15|-104.683333
 30.0|-104.7
-29.65|-104.51666
+29.65|-104.516667
 29.533333|-104.35
-29.483333|-104.21666
+29.483333|-104.216667
 29.4|-104.15
 29.316667|-104.0
-29.266667|-103.78333
-29.183333|-103.68333
+29.266667|-103.783333
+29.183333|-103.683333
 29.15|-103.55
 29.066667|-103.45
 28.916667|-103.18333
 29.183333|-102.983333
-29.208333|-102.88333
+29.208333|-102.883333
 29.358333|-102.883333
 29.4|-102.825
 29.741667|-102.758333
@@ -25508,64 +25358,54 @@ MMTY|0|0|71|23.0|-108.5|31.783333|-93.0|27.39|-102.75
 29.875|-102.316667
 29.791667|-102.05
 29.783333|-101.8
-29.758333|-101.51666
-29.583333|-101.29166
+29.758333|-101.516667
+29.583333|-101.291667
 29.533333|-101.25
 29.366667|-101.0
 29.166667|-100.75
-28.9|-100.63333
-28.65|-100.48333
-28.183333|-100.19166
+28.9|-100.633333
+28.65|-100.483333
+28.183333|-100.191667
 27.983333|-99.95
-27.775|-99.83333
+27.775|-99.833333
 27.65|-99.7
 27.491667|-99.525
-27.308333|-99.51666
+27.308333|-99.516667
 27.066667|-99.45
-26.883333|-99.31666
-26.666667|-99.18333
-26.4|-99.06666
+26.883333|-99.316667
+26.666667|-99.183333
+26.4|-99.066667
 26.233333|-98.65
-26.066667|-98.21666
+26.066667|-98.216667
 26.05|-98.05
 26.033333|-97.75
 25.841667|-97.4
 26.0|-97.0
 26.0|-95.916667
 24.5|-93.0
-23.000481|-95.00021
+23.0|-95.0
+22.41028|-95.0
 23.0|-96.0
-23.363792|-99.34699
-23.449342|-100.23396
-23.666667|-102.83333
+23.026667|-96.2177
+23.294167|-98.5575
+23.438056|-100.0136
+23.458333|-100.2294
+23.509444|-100.7925
+23.603056|-101.9663
+23.666667|-102.8333
+24.1525|-103.4355
 24.214167|-103.51222
 25.749444|-105.46944
 27.087778|-107.24638
 28.0|-108.5
 28.577778|-108.5
 31.333333|-108.5
-MMZT|1|0|10|5.0|-120.0|30.0|-100.0|17.5|-114.0
-30.0|-120.0
-27.925|-117.49
-23.893056|-113.00388
-21.408333|-110.62972
-19.039167|-108.49861
-16.183333|-106.0
-15.0|-105.0
-11.5|-100.0
-10.0|-104.5
-5.0|-120.0
-MMZT|0|0|29|16.183333|-120.833333|32.718611|-102.83333|24.45|-109.0
+MMZT|0|0|22|18.223889|-120.833333|32.718611|-103.4355|24.45|-109.0
 30.75|-120.833333
 32.534167|-117.123611
-32.6|-116.3
-32.633333|-115.91666
-32.679167|-115.25833
-32.7|-115.08333
 32.718611|-114.718611
 32.491667|-114.81111
-32.25|-114.0
-32.1|-113.50833
+32.1|-113.508333
 31.333333|-111.1
 31.333333|-108.5
 28.577778|-108.5
@@ -25573,18 +25413,29 @@ MMZT|0|0|29|16.183333|-120.833333|32.718611|-102.83333|24.45|-109.0
 27.087778|-107.24638
 25.749444|-105.46944
 24.214167|-103.51222
-23.666667|-102.83333
-21.904397|-103.6071
-20.855833|-103.32194
-20.717778|-103.65083
-20.859714|-105.53687
-19.171667|-104.77361
-16.183333|-106.0
+24.1525|-103.4355
+22.690556|-104.8513
+22.285556|-105.1216
+21.625833|-105.5641
+18.223889|-107.7625
 19.039167|-108.49861
 21.408333|-110.62972
 23.893056|-113.00388
 27.925|-117.49
 30.0|-120.0
+MMFO|1|0|12|5.0|-120.0|30.0|-100.0|17.5|-114.0
+30.0|-120.0
+27.925|-117.49
+23.893056|-113.00388
+21.408333|-110.62972
+19.039167|-108.49861
+18.223889|-107.7625
+16.183333|-106.0
+15.335556|-105.2822
+15.0|-105.0
+11.5|-100.0
+10.0|-104.5
+5.0|-120.0
 ZMUB|0|0|296|41.55|87.833333|52.147222|119.93502|46.845|103.85
 49.833333|116.7
 48.895403|116.0868
@@ -26588,7 +26439,7 @@ UBBA|0|0|154|37.9|45.013769|42.633333|51.5|40.266667|48.691666
 41.5|48.233333
 41.84|48.595
 42.633333|50.0
-UBBA-S|0|0|44|38.85|44.7|39.794285|46.151417|39.25523|45.44359
+UBBA-S|0|0|46|38.85|44.7|39.794285|46.151417|39.25523|45.44359
 38.85|46.15
 38.9|46.05
 38.9|45.866667
@@ -26597,6 +26448,7 @@ UBBA-S|0|0|44|38.85|44.7|39.794285|46.151417|39.25523|45.44359
 39.216667|45.166667
 39.4|45.0
 39.5|44.95
+39.714169|44.769085
 39.783333|44.7
 39.714169|44.769085
 39.745711|44.888261
@@ -26633,6 +26485,7 @@ UBBA-S|0|0|44|38.85|44.7|39.794285|46.151417|39.25523|45.44359
 39.028487|46.077425
 39.0172|46.095392
 38.892885|46.151417
+38.85|46.15
 UCFM|0|0|52|40.283333|70.883333|43.583333|80.283333|41.916667|76.1
 42.263333|70.945
 42.266667|70.883333
@@ -27661,7 +27514,7 @@ UKBV|0|0|94|47.766667|27.433333|52.364333|34.45|50.0655|30.941667
 51.240761|34.361997
 51.2442|34.384344
 51.242419|34.428728
-UKFV|0|0|33|42.733333|30.15|47.733333|37.368333|45.233333|33.759167
+UKFV|0|0|34|42.733333|30.15|47.733333|37.368333|45.233333|33.759167
 47.108333|35.916667
 46.966667|36.0
 46.583333|36.7
@@ -27674,6 +27527,7 @@ UKFV|0|0|33|42.733333|30.15|47.733333|37.368333|45.233333|33.759167
 45.071667|36.571667
 44.933333|36.616667
 44.516667|36.666667
+44.0|36.55
 42.733333|36.266667
 42.776667|34.393333
 42.783333|34.0
@@ -29267,22 +29121,13 @@ UNNT|0|0|201|49.083333|69.158333|60.916667|89.75|56.75|79.666667
 59.85|75.5
 60.833333|77.5
 60.666667|80.166667
-URRV|0|0|188|41.183333|36.266667|51.2|50.0|46.583333|43.133334
+URRV|0|0|179|41.183333|36.266667|51.2|50.0|46.583333|43.133334
 49.983333|41.416667
 50.75|43.033333
 51.1|43.633333
 51.2|44.983333
 50.603371|45.846604
 50.451704|47.676604
-50.1|48.083333
-49.866667|48.216667
-49.8|48.416667
-50.019418|48.890669
-50.102751|48.757336
-50.167685|48.811918
-50.208032|48.795413
-50.258007|48.731224
-50.583333|48.65
 50.366667|47.45
 50.333333|47.4
 50.333333|47.316667
@@ -30558,15 +30403,13 @@ YTRT|0|0|40|-23.396944|114.5|-8.323333|137.672222|-13.796825|131.701580
 -11.268056|124.305278
 -12.0|123.333333
 -12.0|114.5
-YASP|0|0|47|-42.35|123.626944|-21.2025|141.629722|-22.45736|133.65313
+YASP|0|0|44|-42.35|123.626944|-21.2025|141.629722|-22.45736|133.65313
 -22.182778|130.226389
 -23.220278|128.463611
 -23.322222|127.135556
--23.322222|127.135556
 -23.365556|126.526111
 -23.396944|126.058889
 -26.578889|124.0
--26.578889|124.0
 -28.062778|124.232222
 -28.595833|124.829722
 -29.0|125.0
@@ -30589,7 +30432,6 @@ YASP|0|0|47|-42.35|123.626944|-21.2025|141.629722|-22.45736|133.65313
 -32.995|135.133333
 -32.429167|135.033611
 -31.583333|135.416667
--31.583333|135.416667
 -31.583333|137.833333
 -31.583333|139.0
 -32.301389|139.448611
@@ -30886,7 +30728,7 @@ YDOS|0|0|29|-30.697778|150.324614|-26.5125|153.211111|-28.32161|151.82435
 -28.629167|150.699722
 -28.955687|150.950617
 -29.268816|151.297288
-YFLD|0|0|18|-26.960556|151.009722|-16.971389|163.0|-21.856842|157.873790
+YFLD|0|0|19|-26.960556|151.009722|-16.971389|163.0|-21.856842|157.873790
 -16.971389|151.075278
 -18.674167|151.009722
 -19.270278|151.178889
@@ -30903,6 +30745,7 @@ YFLD|0|0|18|-26.960556|151.009722|-16.971389|163.0|-21.856842|157.873790
 -26.904581|155.900209
 -26.960556|155.905278
 -26.816389|163.0
+-24.0|163.0
 -17.666667|163.0
 -16.971389|162.6625
 YFOR|0|0|24|-42.35|123.626944|-28.164167|141.0|-34.870990|130.542438
@@ -31312,7 +31155,7 @@ YWOL|0|0|57|-36.945278|148.821667|-34.339722|152.930556|-35.756651|151.303522
 -34.517041|150.597415
 -34.424022|150.485994
 -34.339722|150.414722
-YTSN|0|0|78|-45.0|148.573333|3.5|170.0|-38.158707|157.389245
+YTSN|0|0|77|-45.0|148.573333|3.5|170.0|-38.158707|157.389245
 -38.188611|150.320556
 -40.0|150.565
 -40.567222|150.644167
@@ -31345,7 +31188,6 @@ YTSN|0|0|78|-45.0|148.573333|3.5|170.0|-38.158707|157.389245
 -12.0|148.573333
 -16.166389|151.105833
 -16.971389|151.075278
--16.971389|151.075278
 -18.674167|151.009722
 -19.270278|151.178889
 -21.653333|151.868889
@@ -32287,7 +32129,7 @@ YCRS|0|0|8|-31.690278|117.358333|-29.3|120.400833|-30.938281|118.888494
 -31.168611|120.400833
 -29.3|120.0
 -30.338056|118.442778
-YWEG|0|0|17|-29.340833|137.013889|-21.725833|147.715833|-26.482729|143.189324
+YWEG|0|0|16|-29.340833|137.013889|-21.725833|147.715833|-26.482729|143.189324
 -26.225278|138.39
 -27.412222|140.5025
 -28.0225|141.629722
@@ -32304,7 +32146,6 @@ YWEG|0|0|17|-29.340833|137.013889|-21.725833|147.715833|-26.482729|143.189324
 -23.166667|140.771389
 -23.166667|137.013889
 -25.017778|137.837778
--26.225278|138.39
 FASA|0|0|139|-37.0|15.0|-22.14|35.0|-30.765751|24.469167
 -27.5|15.0
 -27.5|17.0
diff --git a/VATSpy.dat b/VATSpy.dat
index 4d1a72c6..20102043 100644
--- a/VATSpy.dat
+++ b/VATSpy.dat
@@ -46,19 +46,28 @@ Belgium|EB|Control
 Belize|MZ|
 Benin|DB|
 Bermuda|TX|
+Bhutan|VQ|
 Bolivia|SL|Control
 Bosnia-Herzegovina|LQ|
 Botswana|FB|
 Brazil|SB|
 Brazil|SD|
 Brazil|SI|
+Brazil|SJ|
 Brazil|SS|
 Brazil|SW|
+British Indian Ocean Territory|FJ|
 Bulgaria|LB|Control
 Burkina Faso|DF|
 Burundi|HB|
 Cambodia|VD|Control
 Cameroon|FK|
+Canada|CJ|
+Canada|CK|
+Canada|CL|
+Canada|CN|
+Canada|CP|
+Canada|CS|
 Canada|CW|
 Canada|CY|
 Canada|CZ|
@@ -98,16 +107,17 @@ East Timor|WP|
 Ecuador|SE|
 Egypt|HE|Control
 El Salvador|MS|
+Equatorial Guinea|FG|
 Eritrea|HH|
 Estonia|EE|Control
+Eswatini|FD|
 Ethiopia|HA|Radar
-Islas Malvinas|SF|
+Falkland Islands (Islas Malvinas)|SF|
 Fiji-Tonga|NF|
 Finland|EF|Control
 France|LF|Control
 French Guyana|SO|
 French Polynesia|NT|
-FYROM|LW|Radar
 Gabon|FO|
 Gambia|GB|
 Georgia|UG|
@@ -150,6 +160,7 @@ Kazakhstan|UA|
 Kyrgyzstan|UC|
 Kenya|HK|
 Kiribati-Tuvalu|NG|
+Kosovo|BK|
 Kuwait|OK|
 Laos|VL|Control
 Latvia|EV|Control
@@ -188,9 +199,11 @@ Nicaragua|MN|
 Niger|DR|
 Nigeria|DN|
 North Korea|ZK|
+North Macedonia|LW|Radar
 Norway|EN|Control
 Oman|OO|Control
 Pakistan|OP|
+Palestine|LV|
 Panama|MP|
 Papua New Guinea|AY|
 Paraguay|SG|
@@ -214,7 +227,9 @@ Russia|UW|Control
 Russia|XE|Control
 Russia|XH|Control
 Russia|XI|Control
+Russia|XK|Control
 Russia|XL|Control
+Russia|XM|Control
 Russia|XN|Control
 Russia|XO|Control
 Russia|XR|Control
@@ -226,6 +241,7 @@ Rwanda|HR|
 Saint Kitts and Nevis|TK|
 Saint Vincent and the Grenadines|TV|
 Samoa|NS|
+Sao Tome and Principe|FP|
 Santa Lucia|TL|
 Saudi Arabia|OE|Control
 Senegal|GO|
@@ -245,7 +261,6 @@ Sri Lanka|VC|
 Sudan|HS|
 South Sudan|HJ|
 Surinam|SM|
-Swaziland|FD|
 Sweden|ES|Control
 Switzerland|LS|Radar
 Syria|OS|Radar
@@ -257,6 +272,7 @@ Togo|DX|
 Trinidad and Tobago|TT|Radar
 Tunisia|DT|
 Turkey|LT|Control
+Turks and Caicos Islands|MB|
 Uganda|HU|
 Ukraine|UK|Radar
 United Arab Emirates|OM|Radar
@@ -289,6 +305,7 @@ USA|KX|
 USA|KY|
 USA|KZ|
 USA|PA|
+USA|PC|
 USA|PF|
 USA|PG|
 USA|PH|
@@ -304,6 +321,7 @@ Venezuela|SV|
 Vietnam|VV|Control
 Virgin Islands (British)|TU|
 Virgin Islands (US)|TI|
+Wallis and Futuna|NL|
 Yemen|OY|Radio
 Serbia and Montenegro|LY|Radar
 Zambia|FL|
@@ -1971,6 +1989,11 @@ EGQK|Kinloss|57.649333|-3.560667||EGPX|0
 EGQL|Leuchars|56.372833|-2.8685||EGPX|0
 EGQM|Boulmer|55.41667|-1.6||EGPX|0
 EGQS|Lossiemouth|57.705214|-3.339169||EGPX|0
+EGRE|Magnus|61.62017|1.30717||EGPX|0
+EGRL|Harding|59.2795|1.51617||EGPX|0
+EGRN|Fulmar A|56.49367|2.15467||EGPX|0
+EGRO|Andrew|58.0475|1.40433||EGPX|0
+EGRP|Mungo|57.37533|1.998||EGPX|0
 EGRR|Bracknell-Beaufort Park|51.38306|-0.78306||EGTT|0
 EGSA|Shipdam|52.629444|0.928056||EGTT|0
 EGSB|Bedford Castle Mill|52.143333|-0.405833||EGTT|0
@@ -2061,32 +2084,32 @@ EHAL|Ameland|53.451667|5.676667||EHAA|0
 EHAM|Amsterdam-Schiphol|52.308333|4.765|AMS|EHAA|0
 EHBD|Budel (Weert)|51.255|5.601667||EHAA|0
 EHBK|Beek (Maastricht)|50.916667|5.776667||EHAA|0
-EHDL|Deelen AB|52.059722|5.871944||EHMC|0
+EHDL|Deelen AB|52.059722|5.871944||EHAA|0
 EHDP|Venray/De Peel|51.517278|5.855639||EHAA|0
 EHDR|Drachten|53.12|6.13||EHAA|0
-EHEH|Eindhoven AB|51.45|5.375||EHMC|0
+EHEH|Eindhoven AB|51.45|5.375||EHAA|0
 EHGG|Eelde (Groningen)|53.125|6.583333||EHAA|0
-EHGR|Gilze-Rijen AB|51.567389|4.931833||EHMC|0
+EHGR|Gilze-Rijen AB|51.567389|4.931833||EHAA|0
 EHHA|Amsterdam Heliport|52.413333|4.804167||EHAA|0
 EHHO|Hoogeveen|52.731667|6.516667||EHAA|0
 EHHV|Hilversum|52.191667|5.146667||EHAA|0
-EHKD|De Kooy NAS (Den Helder)|52.925|4.78||EHMC|0
+EHKD|De Kooy NAS (Den Helder)|52.925|4.78||EHAA|0
 EHLE|Lelystad|52.46|5.526667||EHAA|0
-EHLW|Leeuwarden AB|53.225278|5.752528||EHMC|0
+EHLW|Leeuwarden AB|53.225278|5.752528||EHAA|0
 EHMZ|Midden Zeeland (Middelburg)|51.511667|3.731667||EHAA|0
 EHOW|Oostwold|53.008611|7.032778||EHAA|0
 EHRD|Rotterdam|51.956667|4.436667||EHAA|0
-EHSB|Soesterberg AB|52.127306|5.276194||EHMC|0
+EHSB|Soesterberg AB|52.127306|5.276194||EHAA|0
 EHSE|Seppe (Hoeven)|51.555555|4.553333||EHAA|0
 EHST|Stadskanaal|52.998611|7.022778||EHAA|0
 EHTE|Teuge (Deventer)|52.245|6.046667||EHAA|0
 EHTL|Terlet|52.057222|5.924444||EHAA|0
-EHTW|Twente AB|52.276667|6.89||EHMC|0
+EHTW|Twente AB|52.276667|6.89||EHAA|0
 EHTX|Texel|53.115|4.833333||EHAA|0
-EHVB|Valkenburg NAS|52.166111|4.418056||EHMC|0
-EHVK|Volkel AB|51.657194|5.707833||EHMC|0
-EHVL|Vlieland Range|53.25|4.91639||EHMC|0
-EHWO|Woensdrecht AB|51.449|4.342139||EHMC|0
+EHVB|Valkenburg NAS|52.166111|4.418056||EHAA|0
+EHVK|Volkel AB|51.657194|5.707833||EHAA|0
+EHVL|Vlieland Range|53.25|4.91639||EHAA|0
+EHWO|Woensdrecht AB|51.449|4.342139||EHAA|0
 EIAB|Abbeyshrule|53.591389|-7.642778||EISN|0
 EIAC|Custume|53.425|-7.9475||EISN|0
 EIAH|Andona|53.443056|-6.261944||EISN|0
@@ -8686,8 +8709,6 @@ LZTN|Trencin|48.864716|17.99361||LZBB|0
 LZTR|Boleraz/Stefan Banic|48.453611|17.526389||LZBB|0
 LZTT|Tatry|49.073611|20.241111||LZBB|0
 LZZI|Zilina|49.233326|18.613611||LZBB|0
-M666|Rowan Gorilla VII|56.18917|2.76967|M666|EGPX|0
-M820|Irish Sea Pioneer|53.647|-3.48033|M820|EGPX|0
 MBAC|Ambergris Cay International|21.300633|-71.64115||KZMA|0
 MBGT|JAGS McCartney. Turks and Caicos|21.444444|-71.142222|GDT|MYNN|0
 MBNC|North Caicos International|21.917486|-71.939658|NCA|KZMA|0
@@ -9352,40 +9373,40 @@ NCMR|Mitiaro|-19.838833|-157.698833|MOI|NSFA|0
 NCPK|Pukapuka|-10.913289|-165.833061|PZK|NSFA|0
 NCPY|Tongareva|-9.023667|-158.027333|PYE|NSFA|0
 NCRG|Rarotonga|-21.200833|-159.795|RAR|NSFA|0
-NFCI|Cicia|-17.743333|-179.342167||NFFF|0
-NFFA|Ba|-17.550022|177.683333||NFFF|0
-NFFN|Nadi|-17.756389|177.443611||NFFF|0
-NFFO|Malololailai|-17.778|177.196667||NFFF|0
-NFFR|Rabi|-16.503411|-179.956197||NFFF|0
-NFGO|Mago Island|-17.438653|-179.163569||NFFF|0
-NFKB|Kaibu|-17.254333|-179.488833||NFFF|0
-NFKD|Kadavu|-19.053|178.167667||NFFF|0
-NFMA|Mana|-17.673055|177.098328||NFFF|0
-NFMO|Moala|-18.567167|179.901||NFFF|0
-NFNA|Nausori|-18.044722|178.563056||NFFF|0
-NFNB|Bureta|-17.71|178.7255||NFFF|0
-NFND|Pacific Harbour-Deuba SPB|-18.183333|178.233333||NFFF|0
-NFNG|Gau Island|-18.115|179.339167||NFFF|0
-NFNH|Laucala|-16.747167|-179.6675||NFFF|0
-NFNK|Lakemba|-18.23306|-178.8||NFFF|0
-NFNL|Labasa|-16.466667|179.339833||NFFF|0
-NFNM|Matei|-16.691667|-179.878167||NFFF|0
-NFNO|Koro|-17.3455|179.422167||NFFF|0
+NFCI|Cicia|-17.743333|-179.342167||NFFN|0
+NFFA|Ba|-17.550022|177.683333||NFFN|0
+NFFN|Nadi|-17.756389|177.443611||NFFN|0
+NFFO|Malololailai|-17.778|177.196667||NFFN|0
+NFFR|Rabi|-16.503411|-179.956197||NFFN|0
+NFGO|Mago Island|-17.438653|-179.163569||NFFN|0
+NFKB|Kaibu|-17.254333|-179.488833||NFFN|0
+NFKD|Kadavu|-19.053|178.167667||NFFN|0
+NFMA|Mana|-17.673055|177.098328||NFFN|0
+NFMO|Moala|-18.567167|179.901||NFFN|0
+NFNA|Nausori|-18.044722|178.563056||NFFN|0
+NFNB|Bureta|-17.71|178.7255||NFFN|0
+NFND|Pacific Harbour-Deuba SPB|-18.183333|178.233333||NFFN|0
+NFNG|Gau Island|-18.115|179.339167||NFFN|0
+NFNH|Laucala|-16.747167|-179.6675||NFFN|0
+NFNK|Lakemba|-18.23306|-178.8||NFFN|0
+NFNL|Labasa|-16.466667|179.339833||NFFN|0
+NFNM|Matei|-16.691667|-179.878167||NFFN|0
+NFNO|Koro|-17.3455|179.422167||NFFN|0
 NFNR|Rotuma|-12.5|177.05||NFFF|0
-NFNS|Savusavu|-16.799167|179.338833||NFFF|0
-NFNU|Bua|-16.859172|178.624325||NFFF|0
-NFNV|Vatukoula|-17.49868|177.837194||NFFF|0
-NFNW|Wakay|-17.628833|179.0105||NFFF|0
+NFNS|Savusavu|-16.799167|179.338833||NFFN|0
+NFNU|Bua|-16.859172|178.624325||NFFN|0
+NFNV|Vatukoula|-17.49868|177.837194||NFFN|0
+NFNW|Wakay|-17.628833|179.0105||NFFN|0
 NFOL|Ono I Lau|-20.659167|-178.741||NFFF|0
-NFSW|Yasawa|-16.759167|177.545833||NFFF|0
+NFSW|Yasawa|-16.759167|177.545833||NFFN|0
 NFTE|Eua|-21.377167|-174.9575||NSFA|0
 NFTF|Fua'Amotu|-21.241|-175.139667||NSFA|0
 NFTL|Haapai|-19.8|-174.34972||NSFA|0
 NFTO|Niuafo'ou|-15.571|-175.628||NSFA|0
 NFTP|Niuatoputapu|-15.978167|-173.7525||NSFA|0
 NFTV|Vavau|-18.585333|-173.961667||NSFA|0
-NFVB|Vanuabalavu|-17.2445|178.956333||NFFF|0
-NFVL|Vatulele|-18.512167|177.638833||NFFF|0
+NFVB|Vanuabalavu|-17.2445|178.956333||NFFN|0
+NFVL|Vatulele|-18.512167|177.638833||NFFN|0
 NGAB|Abaiang|-1.798591|173.040244||NFFF|0
 NGBR|Beru|-1.35|176|BEZ|NFFF|0
 NGFO|Nanumea|-5.66667|176.13306||NFFF|0
@@ -9468,52 +9489,52 @@ NTTR|Uturoa Raiatea island|-16.723333|-151.46667||NTTT|0
 NTTW|Tetiaroa|-17.015752|-149.588814||NTTT|0
 NTTX|Mururoa|-21.81667|-138.8||NTTT|0
 NTUV|Vahitahi|-18.781167|-138.856333||NTTT|0
-NVSA|Mota Lava|-13.666|167.712||NFFF|0
-NVSC|Sola Vanua Lava|-13.84972|167.55||NFFF|0
-NVSD|Torres|-13.327667|166.637667||NFFF|0
-NVSE|Emae|-17.097|168.335333||NFFF|0
-NVSF|Craig Cove|-16.2|167.5||NFFF|0
-NVSG|Longana|-15.316667|167.96666||NFFF|0
-NVSH|Sara|-15.470833|168.152222||NFFF|0
-NVSL|Lamap Malekula|-16.41667|167.8||NFFF|0
-NVSM|Lamen Bay|-16.586794|168.160406||NFFF|0
-NVSN|Maewo|-14.996747|168.080797||NFFF|0
-NVSO|Lonorore|-15.865556|168.171944||NFFF|0
-NVSP|Norsup|-16.078|167.399667||NFFF|0
-NVSQ|Gaua|-14.219667|167.588||NFFF|0
-NVSR|Redcliffe|-15.471663|167.835556||NFFF|0
-NVSS|Pekoa Santo|-15.50565|167.221275||NFFF|0
-NVST|Tongoa Island|-16.891111|168.551389||NFFF|0
-NVSU|Ulei|-16.333|168.283||NFFF|0
-NVSV|Valesdir|-16.796111|168.176944||NFFF|0
-NVSW|Walaha|-15.412|168.691||NFFF|0
-NVSX|Southwest Bay|-16.495|167.438||NFFF|0
-NVSZ|North West Santo|-14.881667|166.558056||NFFF|0
-NVVA|Anelghowhat|-20.249167|169.771389||NFFF|0
-NVVB|Aniwa|-19.24|169.605||NFFF|0
-NVVD|Dillon's Bay|-18.769444|169.001389||NFFF|0
-NVVF|Futuna Island|-19.516389|170.231944||NFFF|0
-NVVI|Ipota|-18.856333|169.283||NFFF|0
-NVVV|Bauerfield Efate|-17.703889|168.312222||NFFF|0
-NVVW|Tanna|-19.459667|169.2255||NFFF|0
-NWWA|Tiga|-21.096|167.803833||NFFF|0
-NWWB|Bourail Poe|-21.609722|165.397778||NFFF|0
-NWWC|Wala|-19.721167|163.6635||NFFF|0
-NWWD|Kone|-21.054333|164.837||NFFF|0
-NWWE|Moue Ile Des Pins|-22.6|167.44972||NFFF|0
-NWWH|Houailou|-21.259667|165.620167||NFFF|0
-NWWK|Koumac Nlle-Caledonie|-20.56667|164.28306||NFFF|0
-NWWL|Ouanaham Ile Lifou|-20.76667|167.23306||NFFF|0
-NWWM|Noumea Magenta|-22.258333|166.472833||NFFF|0
-NWWO|Ile Ouen-Edmond Cane|-22.463888|166.78305||NFFF|0
-NWWP|Poum Malabou|-20.289167|164.099333||NFFF|0
-NWWQ|Nickel|-21.316668|165||NFFF|0
-NWWR|La Roche Ile Mare|-21.48306|168.03306||NFFF|0
-NWWT|La Foa Oua Tom|-21.819722|165.860833||NFFF|0
-NWWU|Touho|-20.79|166.2595||NFFF|0
-NWWV|Ouloup Ile Ouvea|-20.64972|166.58306||NFFF|0
-NWWW|La Tontouta Nlle-Caledonie|-22.016389|166.216111||NFFF|0
-NWWX|Canala|-21.522833|165.975667||NFFF|0
+NVSA|Mota Lava|-13.666|167.712||NVVV|0
+NVSC|Sola Vanua Lava|-13.84972|167.55||NVVV|0
+NVSD|Torres|-13.327667|166.637667||NVVV|0
+NVSE|Emae|-17.097|168.335333||NVVV|0
+NVSF|Craig Cove|-16.2|167.5||NVVV|0
+NVSG|Longana|-15.316667|167.96666||NVVV|0
+NVSH|Sara|-15.470833|168.152222||NVVV|0
+NVSL|Lamap Malekula|-16.41667|167.8||NVVV|0
+NVSM|Lamen Bay|-16.586794|168.160406||NVVV|0
+NVSN|Maewo|-14.996747|168.080797||NVVV|0
+NVSO|Lonorore|-15.865556|168.171944||NVVV|0
+NVSP|Norsup|-16.078|167.399667||NVVV|0
+NVSQ|Gaua|-14.219667|167.588||NVVV|0
+NVSR|Redcliffe|-15.471663|167.835556||NVVV|0
+NVSS|Pekoa Santo|-15.50565|167.221275||NVVV|0
+NVST|Tongoa Island|-16.891111|168.551389||NVVV|0
+NVSU|Ulei|-16.333|168.283||NVVV|0
+NVSV|Valesdir|-16.796111|168.176944||NVVV|0
+NVSW|Walaha|-15.412|168.691||NVVV|0
+NVSX|Southwest Bay|-16.495|167.438||NVVV|0
+NVSZ|North West Santo|-14.881667|166.558056||NVVV|0
+NVVA|Anelghowhat|-20.249167|169.771389||NVVV|0
+NVVB|Aniwa|-19.24|169.605||NVVV|0
+NVVD|Dillon's Bay|-18.769444|169.001389||NVVV|0
+NVVF|Futuna Island|-19.516389|170.231944||NVVV|0
+NVVI|Ipota|-18.856333|169.283||NVVV|0
+NVVV|Bauerfield Efate|-17.703889|168.312222||NVVV|0
+NVVW|Tanna|-19.459667|169.2255||NVVV|0
+NWWA|Tiga|-21.096|167.803833||NWWW|0
+NWWB|Bourail Poe|-21.609722|165.397778||NWWW|0
+NWWC|Wala|-19.721167|163.6635||NWWW|0
+NWWD|Kone|-21.054333|164.837||NWWW|0
+NWWE|Moue Ile Des Pins|-22.6|167.44972||NWWW|0
+NWWH|Houailou|-21.259667|165.620167||NWWW|0
+NWWK|Koumac Nlle-Caledonie|-20.56667|164.28306||NWWW|0
+NWWL|Ouanaham Ile Lifou|-20.76667|167.23306||NWWW|0
+NWWM|Noumea Magenta|-22.258333|166.472833||NWWW|0
+NWWO|Ile Ouen-Edmond Cane|-22.463888|166.78305||NWWW|0
+NWWP|Poum Malabou|-20.289167|164.099333||NWWW|0
+NWWQ|Nickel|-21.316668|165||NWWW|0
+NWWR|La Roche Ile Mare|-21.48306|168.03306||NWWW|0
+NWWT|La Foa Oua Tom|-21.819722|165.860833||NWWW|0
+NWWU|Touho|-20.79|166.2595||NWWW|0
+NWWV|Ouloup Ile Ouvea|-20.64972|166.58306||NWWW|0
+NWWW|La Tontouta Nlle-Caledonie|-22.016389|166.216111||NWWW|0
+NWWX|Canala|-21.522833|165.975667||NWWW|0
 NZAA|Auckland|-37.019217|174.770674|AKL|NZAA|0
 NZAA|Auckland|-37.019217|174.770674|NZAA-F|NZAA|1
 NZAH|Taharoa Iron Sands|-43.894186|171.747975||NZAA|0
@@ -9582,7 +9603,7 @@ NZJF|Whakatane Hospital|-37.965556|176.976667||NZCB|0
 NZJG|Gisborne Hospital|-38.638611|178.003611||NZCB|0
 NZJH|Hastings Hospital|-39.63|176.823889||NZOH|0
 NZJI|Bay Of Islands Hospital|-35.385833|174.070278||NZAA|0
-NZJJ|Christchurch Hospital Hagley|-43.536944|172.621111||NZCH|0
+NZJJ|Christchurch Hospital Hagley|-43.536944|172.621111||NZCS|0
 NZJK|Kaitaia Hospital|-35.118417|173.260917||NZAA|0
 NZJL|Water Aerodrome Auckland Hospital|-36.859167|174.768889||NZAA|0
 NZJM|Palmerston North Hospital|-40.337778|175.6194444||NZOH|0
@@ -10017,7 +10038,7 @@ ORKK|Kirkuk|35.4695|44.349||ORBB|0
 ORMM|Basrah|30.549|47.662167||ORBB|0
 ORNI|Al Najaf|31.989833|44.404333||ORBB|0
 ORSU|Sulaymaniyah|35.560833|45.314667||ORBB|0
-ORWH|Washington Army Heliport|33.304617|44.403535||ORWH|0
+ORWH|Washington Army Heliport|33.304617|44.403535||ORBB|0
 OSAP|Aleppo Intl|36.179722|37.226111||OSTT|0
 OSDI|Damascus Intl|33.410833|36.513333||OSTT|0
 OSDZ|Deirzzor|35.283333|40.166667||OSTT|0
@@ -10332,6 +10353,7 @@ PFKU|Koyukuk|64.875806|-157.730444||PAZA|0
 PFKW|Kwethluk|60.790333|-161.443694||PAZA|0
 PFLT|Flat|62.452649|-157.98907||PAZA|0
 PFME|Mertarvik Quarry Road Landing Strip|60.818385|-164.519014||PAZA|0
+PFMP|Rampart|65.5079|-150.140833||PAZA|0
 PFNO|Robert/Bob/Curtis Memorial|66.817528|-161.02225||PAZA|0
 PFSH|Shaktoolik|64.371083|-161.223972||PAZA|0
 PFTK|Taku Lodge|58.489683|-133.943421||PAZA|0
@@ -10399,7 +10421,6 @@ PPGM|Port Graham|59.348475|-151.830322||PAZA|0
 PPIT|Nunapitchuk|60.906|-162.440583||PAZA|0
 PPIZ|Point Lay AK|69.81667|-162.91639||PAZA|0
 PPWR|Port Walter|56.381017|-134.650931||PAZA|0
-PRMP|Rampart|65.5079|-150.140833||PAZA|0
 PTKK|Truk Intl-Moen Island Micronesia|7.461892|151.843022|TKK|KZAK|0
 PTPN|Ponape Island Micronesia|6.9851|158.208989|PNI|KZAK|0
 PTRO|Koror-Palau Island Micronesia|7.367303|134.544278|ROR|KZAK|0
@@ -10409,131 +10430,6 @@ PTYA|Yap Island Micronesia|9.498911|138.082497|T11|KZAK|0
 PWAK|Wake Island Airfld|19.28|166.641667|AWK|KZAK|0
 PWBB|Stebbins|63.515972|-162.278||PAZA|0
 PWSM|Wiseman|67.405107|-150.120878||PAZA|0
-QDHP|Derriford Hospital|50.416932|-4.113663|QDHP|EGTT|0
-QG27|Bruce D|59.74367|1.67217|QG27|EGPX|0
-QG28|Bruce CR|59.74434|1.67283|QG28|EGPX|0
-QG29|Bruce PUQ|59.743|1.6725|QG29|EGPX|0
-QG2A|Brent A|61.03483|1.7055|QG2A|EGPX|0
-QG2B|Brent B|61.05583|1.71317|QG2B|EGPX|0
-QG2C|Brent C|61.09616|1.72183|QG2C|EGPX|0
-QG2D|Brent D|61.13233|1.73617|QG2D|EGPX|0
-QG2F|Brent Flare|61.04567|1.7555|QG2F|EGPX|0
-QG2Y|Beryl A Riser|59.54517|1.53567|QG2Y|EGPX|0
-QG3P|Claymore CPP|58.44867|-0.25367|QG3P|EGPX|0
-QG3Y|Claymore CAP|58.49967|-0.25617|QG3Y|EGPX|0
-QG52|Beryl SPM-2|59.55433|1.56267|QG52|EGPX|0
-QG53|Beryl SPM-|59.53433|1.55917|QG53|EGPX|0
-QG91|Morecambe South DP1|53.847|-3.57917|QG91|EGPX|0
-QG93|Morecambe South DP3|53.81667|-3.56017|QG93|EGPX|0
-QG94|Morecambe South DP4|53.87616|-3.561|QG94|EGPX|0
-QG96|Morecambe South DP6|53.865|-3.61667|QG96|EGPX|0
-QG98|Morecambe South DP8|53.89183|-3.62283|QG98|EGPX|0
-QG9T|Murchison CBG|61.39684|1.74067|QG9T|EGPX|0
-QGA4|Alwyn 15S|60.84666|1.6795|QGA4|EGPX|0
-QGA5|AlwynA01|60.598|1.8015|QGA5|EGPX|0
-QGA9|Alwyn E1 |60.762|1.71533|QGA9|EGPX|0
-QGAB|Alba North|58.05883|1.081|QGAB|EGPX|0
-QGAE|Ardmore|56.18917|2.76967|QGAE|EGPX|0
-QGAK|Auk A|56.40067|2.06333|QGAK|EGPX|0
-QGAR|Arbroath A|57.37483|1.38333|QGAR|EGPX|0
-QGAW|Andrew|58.0475|1.40433|QGAW|EGPX|0
-QGAX|Alwyn North NAA|60.80933|1.7375|QGAX|EGPX|0
-QGAY|Alwyn North NAB|60.81017|1.73533|QGAY|EGPX|0
-QGB0|Brae East|58.87666|1.52667|QGB0|EGPX|0
-QGB1|Brae A |58.69267|1.28183|QGB1|EGPX|0
-QGB2|Brae B|58.79233|1.34733|QGB2|EGPX|0
-QGB6|Beatrice AP|58.11483|-3.08733|QGB6|EGPX|0
-QGB7|Beatrice B|58.148|-3.02|QGB7|EGPX|0
-QGB8|Beatrice C|58.09467|-3.15167|QGB8|EGPX|0
-QGB9|Beatrice CSS|58.1475|-3.02133|QGB9|EGPX|0
-QGBA|Britannia|58.04867|1.13867|QGBA|EGPX|0
-QGBE|Beatrice AD|58.11533|-3.086|QGBE|EGPX|0
-QGBF|Beryl Flare|59.5465|1.53433|QGBF|EGPX|0
-QGBM|Balmoral FPV|58.22933|1.10867|QGBM|EGPX|0
-QGBN|Buchan A FPU|57.90367|0.03233|QGBN|EGPX|0
-QGBT|Beryl A|59.54567|1.53783|QGBT|EGPX|0
-QGBV|Beryl B|59.61033|1.513|QGBV|EGPX|0
-QGC4|Captain BLPA|58.306|-1.7715|QGC4|EGPX|0
-QGCA|Cormorant North A|61.2405|1.1495|QGCA|EGPX|0
-QGCL|Clyde A|56.45267|2.2885|QGCL|EGPX|0
-QGCN|Cormorant North|61.22617|1.12067|QGCN|EGPX|0
-QGCO|Cook|57.4|0.81667|QGCO|EGPX|0
-QGCR|Calder|53.8075|-3.66333|QGCR|EGPX|0
-QGCS|Cormorant South|61.10266|1.07283|QGCS|EGPX|0
-QGCW|Captain WPPA|58.3075|-1.7685|QGCW|EGPX|0
-QGD1|Douglas DA|53.538|-3.5785|QGD1|EGPX|0
-QGD2|Douglas DP|53.538|-3.57683|QGD2|EGPX|0
-QGD3|Douglas DW|53.538|-3.5755|QGD3|EGPX|0
-QGDB|Dunbar|61.62933|1.653|QGDB|EGPX|0
-QGDF|Douglas FPF|53.6835|-3.54467|QGDF|EGPX|0
-QGDX|Dunlin A|61.27483|1.59767|QGDX|EGPX|0
-QGEE|Erskine B|57.03983|2.07133|QGEE|EGPX|0
-QGEI|Eider A|61.35733|1.1615|QGEI|EGPX|0
-QGEN|Everest North A(T)|57.758|1.80383|QGEN|EGPX|0
-QGEP|Elgin PUQ|57.01167|1.83783|QGEP|EGPX|0
-QGER|Everest North Riser|57.758|1.80383|QGER|EGPX|0
-QGET|ETAP|57.2945|1.66133|QGET|EGPX|0
-QGEV|Everest North A(P)|57.75867|1.80167|QGEV|EGPX|0
-QGEW|Elgin WHP|57.01233|1.84|QGEW|EGPX|0
-QGF1|MCP01|58.8275|-0.2865|QGF1|EGPX|0
-QGFA|Forties A|57.732|0.97267|QGFA|EGPX|0
-QGFB|Forties B|57.74933|0.915|QGFB|EGPX|0
-QGFC|Forties C|57.727|0.8475|QGFC|EGPX|0
-QGFD|Forties D|57.72233|0.90317|QGFD|EGPX|0
-QGFE|Forties E|57.71617|1.03217|QGFE|EGPX|0
-QGFL|Armada|57.9575|1.84583|QGFL|EGPX|0
-QGFM|Fulmar A|56.49367|2.15467|QGFM|EGPX|0
-QGFN|Franklin WHP A|56.96684|1.87017|QGFN|EGPX|0
-QGFP|Fulmar AD|56.49267|2.155|QGFP|EGPX|0
-QGG1|Gannet A|57.185|1|QGG1|EGPX|0
-QGGE|Goldeneye|58.00383|1.62017|QGGE|EGPX|0
-QGH8|Hutton A North West|61.1065|1.30917|QGH8|EGPX|0
-QGHA|Heather A|60.95367|0.94|QGHA|EGPX|0
-QGHG|Harding|59.2795|1.51617|QGHG|EGPX|0
-QGHM|Hamilton|53.56683|-3.453|QGHM|EGPX|0
-QGHS|Harding STL Buoy|59.2765|1.5505|QGHS|EGPX|0
-QGHX|Hamilton North|53.64717|-3.4765|QGHX|EGPX|0
-QGIV|Ivanhoe|58.191|0.113|QGIV|EGPX|0
-QGJD|Jade|56.50566|2.15133|QGJD|EGPX|0
-QGJF|Janice Alpha FPU|56.39667|2.24833|QGJF|EGPX|0
-QGJY|Judy A|56.6975|2.3385|QGJY|EGPX|0
-QGK1|Kittiwake Loading Buoy|57.4715|0.51167|QGK1|EGPX|0
-QGKK|Kittiwake|57.46833|0.51217|QGKK|EGPX|0
-QGLF|Leadon FPSO Global Producer II|59.562|1.65817|QGLF|EGPX|0
-QGLM|Lomond A|57.2875|2.17833|QGLM|EGPX|0
-QGLX|Lennox|53.63216|-3.175|QGLX|EGPX|0
-QGM2|Morecambe South AP1|53.8465|-3.58183|QGM2|EGPX|0
-QGM9|Morecambe North DPPA|53.9605|-3.67083|QGM9|EGPX|0
-QGMC|Morecambe South CPP1|53.84666|-3.58067|QGMC|EGPX|0
-QGME|Maureen|58.131|1.70067|QGME|EGPX|0
-QGMF|Morecambe FL|53.8465|-3.581|QGMF|EGPX|0
-QGMG|Magnus|61.62017|1.30717|QGMG|EGPX|0
-QGML|Miller B|58.72217|1.402|QGML|EGPX|0
-QGMN|Mungo|57.37533|1.998|QGMN|EGPX|0
-QGMP|Marnoc PDR|57.2945|1.6615|QGMP|EGPX|0
-QGMQ|Marnock QU|57.29367|1.66083|QGMQ|EGPX|0
-QGMX|Millom West|54.027|-3.86017|QGMX|EGPX|0
-QGMZ|Montrose A|57.45067|1.38783|QGMZ|EGPX|0
-QGN7|Ninian Northern|60.906|1.42117|QGN7|EGPX|0
-QGN8|Ninian Central|60.85683|1.46917|QGN8|EGPX|0
-QGN9|Ninian Southern|60.8055|1.45033|QGN9|EGPX|0
-QGNL|Nelson|57.663|1.14567|QGNL|EGPX|0
-QGNP|Galley FPF Northern Producer|58.29367|0.43367|QGNP|EGPX|0
-QGNX|Booster Platform Norpipe A.S|55.29066|0.20317|QGNX|EGPX|0
-QGNY|Booster Platform 1 Norpipe A.S|55.90017|1.61183|QGNY|EGPX|0
-QGPB|Piper B|58.46133|0.251|QGPB|EGPX|0
-QGS8|Scott JD |58.28933|0.20217|QGS8|EGPX|0
-QGS9|Scott JU|58.289|0.20067|QGS9|EGPX|0
-QGSI|Saltire|58.41684|0.33417|QGSI|EGPX|0
-QGSW|Shearwater A|57.03217|1.95533|QGSW|EGPX|0
-QGTA|Tartan A|58.36983|0.07367|QGTA|EGPX|0
-QGTE|Telford|58.20917|0.30917|QGTE|EGPX|0
-QGTL|Thistle A|61.463|1.57983|QGTL|EGPX|0
-QGTR|Tern A|61.276|0.9195|QGTR|EGPX|0
-QGZC|Shearwater C|57.03117|1.95483|QGZC|EGPX|0
-QLHN|Lippitts Hill NPAS|51.654727|0.017264|QLHN|EGTT|0
-QMKB|Milton Keynes Bowl|52.01764|-0.764569|QMKB|EGTT|0
-QRLH|Royal London Hospital|51.518295|-0.058554|QRLH|EGTT|0
 RCAY|Gangshan AFB|22.78306|120.26639||RCAA|0
 RCBS|Kinmen-Shang Yi AFB|24.431944|118.359444|KNH|RCAA|0
 RCCM|Cimei|23.125|119.243|CMJ|RCAA|0
@@ -10572,17 +10468,17 @@ RJAH|Hyakuri|36.181261|140.415019||RJTG|0
 RJAI|Ichikawa|35.73306|139.91639||RJTG|0
 RJAK|Kasumigaura|36.03306|140.19972||RJTG|0
 RJAM|Minamitorishima|24.3|153.96639||RJTG|0
-RJAN|Niijima|34.369444|139.268611|IHA|RJJJ|0
+RJAN|Niijima|34.369444|139.268611|IHA|RJTG|0
 RJAO|Chichijima|27.08306|142.18306||RJTG|0
 RJAT|Fuji|35.31667|138.86639||RJTG|0
 RJAW|Iwojima|24.791075|141.32115||RJTG|0
-RJAZ|Kozushima|34.189444|139.133611||RJJJ|0
+RJAZ|Kozushima|34.189444|139.133611||RJTG|0
 RJBB|Osaka-Kansai|34.427306|135.244072|KIX|RJTG|0
 RJBB|Osaka-Kansai|34.427306|135.244072|KANSAI|RJTG|1
 RJBD|Nankishirahama|33.662311|135.364528||RJTG|0
 RJBE|Kobe|34.632778|135.223889||RJTG|0
 RJBH|Hiroshimanishi|34.366761|132.413897||RJTG|0
-RJBK|Kohnan|34.591389|133.933333||RJJJ|0
+RJBK|Kohnan|34.591389|133.933333||RJTG|0
 RJBT|Tajima|35.512861|134.786922||RJTG|0
 RJCA|Asahikawa|43.79972|142.36639||RJTG|0
 RJCB|Obihiro|42.733611|143.2175||RJTG|0
@@ -10598,14 +10494,14 @@ RJCS|Kushiro|42.98306|144.4||RJTG|0
 RJCT|Tokachi|42.891119|143.162486||RJTG|0
 RJCW|Wakkanai|45.404097|141.800781||RJTG|0
 RJCY|Muroran|42.31667|140.98306||RJTG|0
-RJDA|Amakusa|32.482222|130.158889||RJJJ|0
+RJDA|Amakusa|32.482222|130.158889||RJDG|0
 RJDB|Iki|33.749072|129.785761||RJTG|0
 RJDC|Yamaguchi|33.9288|131.276456||RJTG|0
 RJDK|Kamigoto|33.01667|129.18306||RJTG|0
 RJDM|Metabaru|33.31667|130.41639||RJTG|0
 RJDO|Ojika|33.21667|129.05||RJTG|0
 RJDT|Tsushima|34.285|129.330556||RJTG|0
-RJDU|Omura|32.928056|129.934167|OMJ|RJJJ|0
+RJDU|Omura|32.928056|129.934167|OMJ|RJDG|0
 RJEB|Mombetsu|44.303914|143.404028||RJTG|0
 RJEC|Asahikawa|43.670722|142.447503||RJTG|0
 RJEO|Okushiri|42.06667|139.44972||RJTG|0
@@ -10638,9 +10534,9 @@ RJNG|Gifu|35.38306|136.86639||RJTG|0
 RJNH|Hamamatsu|34.750239|137.703083||RJTG|0
 RJNK|Komatsu|36.393631|136.407858||RJTG|0
 RJNO|Oki|36.181083|133.324811||RJTG|0
-RJNS|Shizuoka|34.796111|138.189444|FSZ|RJJJ|0
+RJNS|Shizuoka|34.796111|138.189444|FSZ|RJTG|0
 RJNT|Toyama|36.648344|137.187503||RJTG|0
-RJNW|Noto|37.293333|136.962222|NTQ|RJJJ|0
+RJNW|Noto|37.293333|136.962222|NTQ|RJTG|0
 RJNY|Shizuhama|34.812747|138.298031||RJTG|0
 RJOA|Hiroshima|34.436028|132.919444||RJTG|0
 RJOB|Okayama|34.755706|133.853144||RJTG|0
@@ -10669,7 +10565,7 @@ RJSK|Akita|39.615556|140.218611||RJTG|0
 RJSM|Misawa|40.705211|141.371942||RJTG|0
 RJSN|Niigata|37.955667|139.111719||RJTG|0
 RJSO|Ominato|41.23306|141.13306||RJTG|0
-RJSR|Odate-Noshiro|40.191944|140.371667|ONJ|RJJJ|0
+RJSR|Odate-Noshiro|40.191944|140.371667|ONJ|RJCG|0
 RJSS|Sendai|38.139686|140.916853||RJTG|0
 RJST|Matsushima|38.404919|141.219572||RJTG|0
 RJSU|Kasuminome|38.23306|140.91639||RJTG|0
@@ -10752,11 +10648,11 @@ RODN|Kadena|26.355686|127.767489||RJBG|0
 ROHF|Hamby|26.3|127.76639||RJBG|0
 ROIG|Ishigakijima|24.344444|124.186944||RJBG|0
 ROKJ|Kumejima|26.363728|126.713689||RJBG|0
-ROKR|Kerama|26.168333|127.293333|KJP|RJJJ|0
+ROKR|Kerama|26.168333|127.293333|KJP|RJBG|0
 ROMD|Minamidaitojima|25.849956|131.258311||RJTG|0
 ROMY|Miyakojima|24.783319|125.294392||RJBG|0
 RORA|Aguni|26.6|127.23306||RJBG|0
-RORE|Iejima|26.7225|127.786944|IEJ|RJJJ|0
+RORE|Iejima|26.7225|127.786944|IEJ|RJBG|0
 RORH|Hateruma|24.06667|123.79972||RCAA|0
 RORK|Kitadaito|25.948003|131.321639||RJTG|0
 RORS|Shimojishima|24.826903|125.144944||RJBG|0
@@ -14407,7 +14303,7 @@ YALO|Altona|-37.834444|144.808333||YELW|0
 YALR|Aileron|-22.649722|133.35||YASP|0
 YALX|Alexandria Stn|-19.066667|136.699722||YTRT|0
 YALY|Alderly|-22.483333|139.633056||YISA|0
-YAMB|Amberley|-27.640556|152.711944|AMB|YINL|0
+YAMB|Amberley|-27.640556|152.711944|AM|YINL|0
 YAMC|Aramac|-22.966667|145.241667||YISA|0
 YAMJ|Ampilatwatja|-21.655|135.229722||YASP|0
 YAMK|Andamooka|-30.437778|137.137222||YASP|0
@@ -16394,7 +16290,7 @@ YPDK|Perrys Paddock|-31.783056|115.8||YPIY|0
 YPDN|Darwin|-12.414722|130.876389|DN|YTRT|0
 YPDO|Pardoo Stn|-20.116667|119.583333||YOLW|0
 YPDY|Padthaway Stn|-36.616389|140.483333||YTBD|0
-YPEA|Pearce|-31.667778|116.014722|PEA|YPIY|0
+YPEA|Pearce|-31.667778|116.014722|PE|YPIY|0
 YPEC|Aeropelican|-33.066111|151.648056||YARL|0
 YPED|Edinburgh|-34.702222|138.620833|ED|YTBD|0
 YPEE|Portee Stn|-34.422778|139.595||YTBD|0
@@ -17589,8 +17485,6 @@ YYWN|Yarrawin|-30.266389|147.216389||YTBD|0
 YYYA|Yandiearra|-21.299722|118.366667||YOLW|0
 YZAN|Zanthus|-31.033056|123.566389||YPIY|0
 YZHN|Zeehan|-41.883333|145.35||YTAS|0
-Z10T|Bilbas 2|30.405167|31.686833||HECC|0
-Z10W|Bir Hasanah|30.188333|33.426||HECC|0
 ZBAA|Beijing Capital|40.075000|116.590000||ZBPE|0
 ZBAD|Beijing Daxing|39.500833|116.398889||ZBPE|0
 ZBAL|Alxa Left Banner Bayanhot|38.748333|105.584167||ZBPE|0
@@ -17621,59 +17515,61 @@ ZBTL|Tongliao|43.556667|122.199722||ZBPE|0
 ZBUC|Wulanchabu Jining|41.130278|113.106667||ZBPE|0
 ZBUH|Wuhai|39.793333|106.799444||ZBPE|0
 ZBUL|Ulanhot Yilelite|46.194444|122.008611||ZBPE|0
-ZBXH|Xilinhot|43.915556|115.963889||ZBPE|0
 ZBXG|Liangxiang|39.753333|116.121667||ZBPE|0
+ZBXH|Xilinhot|43.915556|115.963889||ZBPE|0
 ZBXZ|Xinzhou Wutaishan|38.597222|112.968333||ZBPE|0
 ZBYC|Yuncheng Zhangxiao|35.117222|111.034722||ZBPE|0
 ZBYN|Taiyuan Wusu|37.748333|112.630000||ZBPE|0
 ZBYZ|Bayannaoer Tianjitai|40.926944|107.739444||ZBPE|0
 ZBZJ|Zhangjiakou Ningyuan|40.739167|114.930833||ZBPE|0
 ZBZL|Zhalantun Genghis Khan|47.866667|122.768889||ZBPE|0
+ZG16|Shaoyang Shaodong|27.226386|111.670184||ZGZU|0
 ZGBH|Beihai Fucheng|21.539444|109.293889||ZGZJ|0
-ZGBS|Baise Bama|23.719444|106.959167||ZGNN|0
-ZGCD|Changde Taohuayuan|28.918889|111.640278||ZGHA|0
-ZGCJ|Huaihua Zhijiang|27.441389|109.699722||ZGHA|0
-ZGCS|Changsha Datuopu|28.199720|113.083060||ZGHA|0
-ZGDY|Zhangjiajie Hehua|29.102778|110.443333||ZGHA|0
-ZGFS|Foshan Shadi|23.083333|113.070833||ZGGG|0
-ZGGG|Guangzhou Baiyun|23.392500|113.298889||ZGGG|0
-ZGHA|Changsha Huanghua|28.196667|113.220833||ZGHA|0
-ZGHC|Hechi Jinchengjiang|24.805|107.710556||ZGGG|0
-ZGHY|Hengyang Nanywe|26.722222|112.618056||ZGGG|0
-ZGHZ|Huizhou Pingtan|23.048611|114.600278||ZGGG|0
-ZGKL|Guilin Liangjiang|25.216667|110.040000||ZGKL|0
-ZGLD|Luoding|22.710833|111.601389||ZGGG|0
+ZGBS|Baise Bama|23.719444|106.959167||ZGZU|0
+ZGCD|Changde Taohuayuan|28.918889|111.640278||ZGZU|0
+ZGCJ|Huaihua Zhijiang|27.441389|109.699722||ZGZU|0
+ZGCS|Changsha Datuopu|28.199720|113.083060||ZGZU|0
+ZGCZ|Chenzhou Beihu|25.753611|112.845556||ZGZU|0
+ZGDY|Zhangjiajie Hehua|29.102778|110.443333||ZGZU|0
+ZGFS|Foshan Shadi|23.083333|113.070833||ZGZU|0
+ZGGG|Guangzhou Baiyun|23.392500|113.298889||ZGZU|0
+ZGHA|Changsha Huanghua|28.196667|113.220833||ZGZU|0
+ZGHC|Hechi Jinchengjiang|24.805|107.710556||ZGZU|0
+ZGHY|Hengyang Nanywe|26.722222|112.618056||ZGZU|0
+ZGHZ|Huizhou Pingtan|23.048611|114.600278||ZGZU|0
+ZGKL|Guilin Liangjiang|25.216667|110.040000||ZGZU|0
+ZGLD|Luoding|22.710833|111.601389||ZGZU|0
 ZGLG|Yongzhou Lingling|26.338889|111.610000||ZGZU|0
-ZGMX|Meizhou Meixian|24.265556|116.099722||ZGGG|0
-ZGNN|Nanning Wuxu|22.616667|108.183333||ZGNN|0
-ZGOW|Chaoshan Jieyang|23.553333|116.501667||ZGGG|0
-ZGSD|Zhuhai Jinwan|22.040000|113.378333||ZGGG|0
+ZGMX|Meizhou Meixian|24.265556|116.099722||ZGZU|0
+ZGNN|Nanning Wuxu|22.616667|108.183333||ZGZU|0
+ZGNT|Shenzhen Nantou|22.59349|113.95620||ZGZU|0
+ZGOW|Chaoshan Jieyang|23.553333|116.501667||ZGZU|0
+ZGSD|Zhuhai Jinwan|22.040000|113.378333||ZGZU|0
+ZGSG|Shaoguan Danxia|24.975555|113.421944||ZGZU|0
 ZGSY|Shaoyang Wugang|26.806111|110.641111||ZGZU|0
-ZG16|Shaoyang Shaodong|27.226386|111.670184||ZGZU|0
-ZGSZ|Shenzhen Baoan|22.638333|113.811667|ZGJD|ZGGG|0
-ZGNT|Shenzhen Nantou|22.59349|113.95620||ZGGG|0
-ZGUH|Zhuhai Jiuzhou|22.251944|113.590278||ZGGG|0
+ZGSZ|Shenzhen Baoan|22.638333|113.811667|ZGJD|ZGZU|0
+ZGUH|Zhuhai Jiuzhou|22.251944|113.590278||ZGZU|0
 ZGWX|Wuzhou|23.456667|111.247778||ZGZU|0
 ZGWZ|Wuzhou Xijiang|23.403056|111.099167||ZGZU|0
-ZGYL|Yulin Fumian|22.433333|110.120278||ZGZU|0
 ZGYJ|Yangjiang Heshan|21.961667|112.1025||ZGZU|0
+ZGYL|Yulin Fumian|22.433333|110.120278||ZGZU|0
 ZGYY|Yueyang Sanhe|29.312778|113.281944||ZGZU|0
 ZGZH|Liuzhou Bailian|24.207778|109.391389||ZGZU|0
 ZGZJ|Zhanjiang|21.216670|110.400000||ZGZJ|0
-ZHCC|Zhengzhou Xinzheng|34.518333|113.841667||ZHCC|0
-ZHES|Enshi Xujiaping|30.320556|109.485278||ZHCC|0
+ZHCC|Zhengzhou Xinzheng|34.518333|113.841667||ZHWH|0
+ZHES|Enshi Xujiaping|30.320556|109.485278||ZHWH|0
 ZHHH|Wuhan Tianhe|30.785000|114.210000||ZHHH|0
-ZHLY|Luoyang|34.741111|112.388333||ZHCC|0
-ZHNY|Nanyang Jiangying|32.980833|112.615278||ZHCC|0
+ZHLY|Luoyang|34.741111|112.388333||ZHWH|0
+ZHNY|Nanyang Jiangying|32.980833|112.615278||ZHWH|0
 ZHSN|Shennongjia Hongping|31.626111|110.34||ZHWH|0
 ZHSY|Shiyan Wudangshan|32.593333|110.906111||ZHWH|0
-ZHXF|Xiangyang Liuji|32.150556|112.290833||ZHHH|0
-ZHXY|Xinyang Minggang|32.540833|114.079167||ZHHH|0
-ZHYC|Yichang Sanxia|30.556389|111.48||ZHHH|0
+ZHXF|Xiangyang Liuji|32.150556|112.290833||ZHWH|0
+ZHXY|Xinyang Minggang|32.540833|114.079167||ZHWH|0
+ZHYC|Yichang Sanxia|30.556389|111.48||ZHWH|0
 ZJDF|Dongfang(H)|19.136667|108.673333||ZJSA|0
-ZJSY|Sanya Phoenix|18.302892|109.412269||ZJSA|0
 ZJHK|Haikou Meilan|19.934856|110.458961||ZJSA|0
 ZJQH|Qionghai Boao|19.139167|110.454167||ZJSA|0
+ZJSY|Sanya Phoenix|18.302892|109.412269||ZJSA|0
 ZJYX|Sansha Yongxing|16.833611|112.345000||ZJSA|0
 ZKHM|Orang|41.429722|129.648611||ZKKP|0
 ZKKC|Kimchaek|40.66667|129.19972||ZKKP|0
@@ -17683,8 +17579,8 @@ ZKSE|Samjiyon|41.907222|128.41||ZKKP|0
 ZKWS|Wonsan|39.164167|127.486167||ZKKP|0
 ZLAK|Ankang|32.708056|108.931111||ZLHW|0
 ZLDH|Dunhuang Mogao|40.161111|94.809167||ZLHW|0
-ZLDX|Dingxin|40.401667|99.79||ZLHW|0
 ZLDL|Haixi Delingha|37.125278|97.268611||ZLHW|0
+ZLDX|Dingxin|40.401667|99.79||ZLHW|0
 ZLGL|Guoluo Maqin|34.418611|100.300556||ZLHW|0
 ZLGM|Golmud|36.400000|94.786111||ZLHW|0
 ZLGY|Guyuan Liupanshan|36.079444|106.216389||ZLHW|0
@@ -17703,10 +17599,10 @@ ZLXH|Gannan Xiahe|34.819167|102.621944||ZLHW|0
 ZLXN|Xining Caojiapu|36.530278|102.039444||ZLHW|0
 ZLXY|Xi'an Xianyang|34.447119|108.751592||ZLHW|0
 ZLYA|Yan'An Nanniwan|36.479861|109.464111||ZLHW|0
-ZLYX|Yan'An|36.600000|109.500000||ZLHW|0
-ZLYN|Xi'an Yanliang|34.643333|109.241667||ZLHW|0
 ZLYL|Yulin Yuyang|38.356944|109.592778||ZLHW|0
+ZLYN|Xi'an Yanliang|34.643333|109.241667||ZLHW|0
 ZLYS|Yushu Batang|32.825|97.125||ZLHW|0
+ZLYX|Yan'An|36.600000|109.500000||ZLHW|0
 ZLZW|Zhongwei Shapotou|37.573333|105.154722||ZLHW|0
 ZLZY|Zhangye Ganzhou|38.808056|100.661111||ZLHW|0
 ZMAH|Arvaikheer|46.2525|102.799167||ZMUB|0
@@ -17745,8 +17641,8 @@ ZPLC|Lincang Boshang|23.739167|100.024444||ZPKM|0
 ZPLJ|Lijiang Sanyi|26.679167|100.245833||ZPKM|0
 ZPMS|Mang City|24.401111|98.531667||ZPKM|0
 ZPNL|Ninglang Luguhu|27.540278|100.759444||ZPKM|0
-ZPPX|Kunming Wujiaba|25.000000|102.750000||ZPKM|0
 ZPPP|Kunming Changshui|25.101944|102.929167||ZPKM|0
+ZPPX|Kunming Wujiaba|25.000000|102.750000||ZPKM|0
 ZPSM|Puer Simao|22.793333|100.959444||ZPKM|0
 ZPTC|Tengchong Tuofeng|24.938056|98.485833||ZPKM|0
 ZPWS|Wenshan Yanshan|23.558333|104.325556||ZPKM|0
@@ -17778,7 +17674,8 @@ ZSNT|Nantong Xingdong|32.070833|120.975556||ZSHA|0
 ZSOF|Hefei Xingqiao|31.988333|116.976667||ZSHA|0
 ZSOX|Hefei Luogang|31.783333|117.300000||ZSHA|0
 ZSPD|Shanghai Pudong|31.141667|121.790000||ZSHA|0
-ZSQD|Qingdao Liuting|36.263333|120.376667||ZSHA|0
+ZSQD|Qingdao Jiaodong|36.365833|120.099166||ZSHA|0
+ZSQX|Qingdao Liuting|36.263333|120.376667||ZSHA|0
 ZSQZ|Quanzhou Jinjiang|24.798889|118.590278||ZSHA|0
 ZSRZ|Rizhao Shanzihe|35.405556|119.323611||ZSHA|0
 ZSSH|Huai'an Lianshui|33.777200|119.1478||ZSHA|0
@@ -17807,8 +17704,8 @@ ZUBJ|Bijie Feixiong|27.266944|105.471667||ZPKM|0
 ZUBZ|Bazhong Enyang|31.737778|106.642778||ZPKM|0
 ZUCK|Chongqing Jiangbei|29.716667|106.640000||ZPKM|0
 ZUDC|Daocheng Yading|29.323056|100.053333||ZPKM|0
-ZUDX|Dazhou Heshi|31.132222|107.43||ZPKM|0
 ZUDS|Chengdu Taipingsi|30.601680|104.013892||ZPKM|0
+ZUDX|Dazhou Heshi|31.132222|107.43||ZPKM|0
 ZUGH|Guanghan|30.948505|104.329590||ZPKM|0
 ZUGU|Guangyuan Panlong|32.390278|105.693889||ZPKM|0
 ZUGY|Guiyang Longdongbao|26.536666|106.800000||ZPKM|0
@@ -17819,8 +17716,8 @@ ZUKD|Kangding|30.143056|101.738611||ZPKM|0
 ZUKJ|Kaili Huangping|26.971944|107.988056||ZPKM|0
 ZULB|Libo|25.451111|107.9625||ZPKM|0
 ZULS|Lhasa Gonggar|29.297778|90.911944||ZPKM|0
-ZULZ|Luzhou Yunlong|29.030556|105.468889||ZPKM|0
 ZULX|Luzhou Lantian|28.852500|105.392500||ZPKM|0
+ZULZ|Luzhou Yunlong|29.030556|105.468889||ZPKM|0
 ZUMT|Zunyi Maotai|27.9625|106.435556||ZPKM|0
 ZUMY|Mianyang Nanjiao|31.428056|104.741111||ZPKM|0
 ZUNC|Nanchong Gaoping|30.798056|106.164444||ZPKM|0
@@ -17839,8 +17736,8 @@ ZUWX|Wanzhou Wuqiao|30.801667|108.433056||ZPKM|0
 ZUXC|Xichang Qingshan|27.989083|102.184361||ZPKM|0
 ZUXJ|Xinjin|30.422834|103.845061||ZPKM|0
 ZUYB|Yibin Wuliangye|28.858333|104.526667||ZPKM|0
-ZUYX|Yibin Caiba|28.800278|104.544444||ZPKM|0
 ZUYI|Xingyi Wanfenglin|25.086667|104.959444||ZPKM|0
+ZUYX|Yibin Caiba|28.800278|104.544444||ZPKM|0
 ZUZH|Panzhihua Baoanying|26.540|101.799||ZPKM|0
 ZUZY|Zunyi Xinzhou|27.811111|107.246111||ZPKM|0
 ZWAK|Aksu Wensu|41.263056|80.289444||ZWUQ|0
@@ -18170,20 +18067,21 @@ MDCS|Santo Domingo||MDCS
 MHCC|Cenamer||MHCC
 MKJK|Kingston||MKJK
 MMEX|Mexico|MEX|MMEX
-MMID|Merida||MMID
-MMTY|Monterrey||MMTY
+MMID|Merida|MID|MMID
+MMTY|Monterrey|MTY|MMTY
 MMZT|Mazatlan|MZT|MMZT
-MMZT|Mazatlan|MMMZ|MMZT
+MMFO|Mazatlan|MZT|MMZT
 MPZL|Panama||MPZL
 MTEG|Port-Au-Prince||MTEG
 MUFH|Havana|HAV|MUFH
 MYNN|Nassau|MYNN|MYNN
 NAT|Shanwick & Gander|NAT|NAT
-NFFF|Nadi Oceanic|NFFF|
-NFFN|Nadi|NFFN|
-NVVV|Port Vila|NVVV|
+NFFF|Nadi Oceanic||NFFF
+NFFN|Nadi||NFFN
+NVVV|Port Vila||NVVV
 NSTU|Pago Pago||NZZO
 NTTT|Tahiti Oceanic||NTTT
+NWWW|Noumea||NWWW
 NZZO|Auckland Oceanic||NZZO
 NZAA|Auckland||NZAA
 NZCB|Christchurch (Bay)|NZCH-B|NZCB
@@ -18225,6 +18123,8 @@ OOMM|Muscat||OOMM
 OPKR|Karachi||OPKR
 OPLR|Lahore||OPLR
 ORBB|Baghdad||ORBB
+ORBB-N|Baghdad North||ORBB-N
+ORBB-S|Baghdad South||ORBB-N
 OSTT|Damascus|OSDI|OSTT
 OYSC|Sanaa||OYSC
 PAZA|Anchorage|ANC|PAZA
@@ -18238,14 +18138,6 @@ RCAA|Taipei|TPE|RCAA
 RJCG|Sapporo ACC - Fukuoka|SPO|RJCG
 RJCG|Sapporo ACC - Fukuoka|RJCO|RJCG
 RJDG|Fukuoka ACC - Fukuoka|FKO|RJDG
-RJJJ|Fukuoka|TOKYO|RJJJ
-RJJJ|Fukuoka|TOKYOE|RJJJ
-RJJJ|Fukuoka|TOKYOS|RJJJ
-RJJJ|Fukuoka|TOKYOW|RJJJ
-RJJJ|Fukuoka|TYO|RJJJ
-RJJJ|Fukuoka|TYOE|RJJJ
-RJJJ|Fukuoka|TYOS|RJJJ
-RJJJ|Fukuoka|TYOW|RJJJ
 RJTG|Tokyo ACC - Fukuoka||RJTG
 RKRR|Incheon ACC - Incheon||RKRR
 RKRR-N|Incheon ACC (North) - Incheon||RKRR-N
@@ -18387,65 +18279,68 @@ WIIF-W|Jakarta (West)|WIIF_W|WIIF-W
 WIIF-E|Jakarta (East)|WIIF_E|WIIF-E
 WMFC|Kuala Lumpur||WMFC
 WSJC|Singapore||WSJC
-YARA|Brisbane (Arafura) 133.7|BN-ARA|
-YTRT|Brisbane (Territory) 133.2|BN-TRT|
-YASP|Melbourne (Alice Springs) 128.85|ML-ASP|
-YKIY|Brisbane (Kimberley) 133.4* (133.2)|BN-KIY|
-YPOT|Melbourne (Port) 127.0* (134.0)|ML-POT|
-YNEW|Melbourne (Newman) 125.4* (134.0)|ML-NEW|
-YASW|Melbourne (Alice Springs West) 131.8* (128.85)|ML-ASW|
-YWAR|Melbourne (Warburton) 124.9* (128.85)|ML-WAR|
-YAUG|Melbourne (Augusta) 127.05* (125.3)|ML-AUG|
-YWRA|Melbourne (Woomera) 132.9* (128.85)|ML-WRA|
-YISA|Brisbane (Isa) 125.2|BN-ISA|
-YBUR|Brisbane (Burnett) 123.0* (134.2)|BN-BUR|
-YCOL|Brisbane Radio (Coral) 133.15* (124.65)|BN-COL|
-YCVN|Brisbane (Carnarvon) 133.8* (134.2)|BN-CVN|
-YDOS|Brisbane (Downs) 135.6* (134.2)|BN-DOS|
-YFLD|Brisbane Radio (Flinders) 132.85* (124.65)|BN-FLD|
-YFOR|Melbourne (Forest) 132.7* (128.85)|ML-FOR|
-YGEL|Melbourne (Geraldton) 134.2* (133.9)|ML-GEL|
-YPIY|Melbourne (Pingelly) 133.9|ML-PIY|
-YIND|Brisbane Radio (Indian) 122.4|ML-IND|
-YINE|Brisbane Radio (Indian East) 123.65* (122.4)|ML-INE|
-YINS|Brisbane Radio (Indian South) 123.2* (122.4)|ML-INS|
-YOLW|Melbourne (Onslow) 134.0|ML-OLW|
-YMEK|Melbourne (Meekatharra) 132.0* (134.0)|ML-MEK|
-YKAT|Melbourne (Katomba) 133.5* (129.8)|ML-KAT|
-YBKE|Melbourne (Bourke) 128.2* (125.3)|ML-BKE|
-YBIK|Melbourne (Bindook) 129.8|ML-BIK|
-YWOL|Melbourne (Wollongong) 125.0* (129.8)|ML-WOL|
-YTSN|Brisbane Radio (Tasman) 124.65|BN-TSN|
-YELW|Melbourne (Eildon Weir) 123.75|ML-ELW|
-YGTH|Melbourne (Griffith) 122.75* (129.8)|ML-GTH|
-YYWE|Melbourne (Yarrowee) 134.32* (123.75)|ML-YWE|
-YOXL|Melbourne (Oxley) 128.5* (125.3)|ML-OXL|
-YTAS|Melbourne (Tasmania) 123.8|ML-TAS|
-YMUN|Melbourne (Mungo) 132.6* (125.3)|ML-MUN|
-YTBD|Melbourne (Tailem Bend) 125.3|ML-TBD|
-YARL|Brisbane (Armidale) 130.9|BN-ARL|
-YWON|Melbourne (Wonthaggi) 135.3* (123.75)|ML-WON|
-YSNO|Melbourne (Snowy) 124.0* (123.75)|ML-SNO|
-YHWE|Brisbane Radio (Howe) 124.95* (124.65)|BN-HWE|
-YKPL|Brisbane (Keppel) 125.9* (134.2)|BN-KPL|
-YMTK|Melbourne (Mount) 133.7* (134.0)|ML-MTK|
-YPAR|Melbourne (Paraburdoo) 133.5* (134.0)|ML-PAR|
-YINL|Brisbane (Inverell) 134.2|BN-INL|
-YSDY|Brisbane (Straddy) 134.3* (134.2)|BN-SDY|
-YSWY|Brisbane (Swampy) 133.2* (120.15)|BN-SWY|
-YTBP|Brisbane (Tabletop) 120.55* (120.15)|BN-TBP|
-YSTR|Brisbane (Sturt) 134.4* (133.2)|BN-STR|
-YBAR|Brisbane (Barra) 123.8* (120.15)|BN-BAR|
-YKEN|Brisbane (Kennedy) 120.15|BN-KEN|
-YBLA|Melbourne (Benalla) 132.2* (123.75)|ML-BLA|
-YESP|Melbourne (Esperance) 123.95* (133.9)|ML-ESP|
-YJAR|Melbourne (Jarrah) 120.3* (133.9)|ML-JAR|
-YLEA|Melbourne (Leeman) 122.4* (133.9)|ML-LEA|
-YGVE|Melbourne (Grove) 133.8* (133.9)|ML-GVE|
-YMZI|Melbourne (Menzies) 134.3* (133.9)|ML-MZI|
-YHYD|Melbourne (Hyden) 118.2* (133.9)|ML-HYD|
-YCRS|Melbourne (Cross) 135.8* (133.9)|ML-CRS|
-YWEG|Brisbane (Warrego) 132.45* (125.2)|BN-WEG|
+YARA|Brisbane (Arafura) 133.7|BN-ARA|YARA
+YARL|Brisbane (Armidale) 130.9|BN-ARL|YARL
+YASP|Melbourne (Alice Springs) 128.85|ML-ASP|YASP
+YASW|Melbourne (Alice Springs West) 131.8* (128.85)|ML-ASW|YASW
+YAUG|Melbourne (Augusta) 127.05* (125.3)|ML-AUG|YAUG
+YBAR|Brisbane (Barra) 123.8* (120.15)|BN-BAR|YBAR
+YBIK|Melbourne (Bindook) 129.8|ML-BIK|YBIK
+YBKE|Melbourne (Bourke) 128.2* (125.3)|ML-BKE|YBKE
+YBLA|Melbourne (Benalla) 132.2* (123.75)|ML-BLA|YBLA
+YBUR|Brisbane (Burnett) 123.0* (134.2)|BN-BUR|YBUR
+YCOL|Brisbane Radio (Coral) 133.15* (124.65)|BN-COL|YCOL
+YCRS|Melbourne (Cross) 135.8* (133.9)|ML-CRS|YCRS
+YCVN|Brisbane (Carnarvon) 133.8* (134.2)|BN-CVN|YCVN
+YDOS|Brisbane (Downs) 135.6* (134.2)|BN-DOS|YDOS
+YELW|Melbourne (Eildon Weir) 123.75|ML-ELW|YELW
+YESP|Melbourne (Esperance) 123.95* (133.9)|ML-ESP|YESP
+YFLD|Brisbane Radio (Flinders) 132.85* (124.65)|BN-FLD|YFLD
+YFOR|Melbourne (Forest) 132.7* (128.85)|ML-FOR|YFOR
+YGEL|Melbourne (Geraldton) 134.2* (133.9)|ML-GEL|YGEL
+YGTH|Melbourne (Griffith) 122.75* (129.8)|ML-GTH|YGTH
+YGVE|Melbourne (Grove) 133.8* (133.9)|ML-GVE|YGVE
+YHWE|Brisbane Radio (Howe) 124.95* (124.65)|BN-HWE|YHWE
+YHYD|Melbourne (Hyden) 118.2* (133.9)|ML-HYD|YHYD
+YIND|Brisbane Radio (Indian) 129.25|ML-IND|YIND
+YINE|Brisbane Radio (Indian East) 123.65* (129.25)|ML-INE|YINE
+YINL|Brisbane (Inverell) 134.2|BN-INL|YINL
+YINS|Brisbane Radio (Indian South) 123.2* (129.25)|ML-INS|YINS
+YISA|Brisbane (Isa) 125.2|BN-ISA|YISA
+YJAR|Melbourne (Jarrah) 120.3* (133.9)|ML-JAR|YJAR
+YKAT|Melbourne (Katomba) 133.5* (129.8)|ML-KAT|YKAT
+YKEN|Brisbane (Kennedy) 120.15|BN-KEN|YKEN
+YKIY|Brisbane (Kimberley) 133.4* (133.2)|BN-KIY|YKIY
+YKPL|Brisbane (Keppel) 125.9* (134.2)|BN-KPL|YKPL
+YLEA|Melbourne (Leeman) 122.4* (133.9)|ML-LEA|YLEA
+YMDE|Brisbane (Mudgee) 133.0* (130.9)|BN-MDE|YMDE
+YMEK|Melbourne (Meekatharra) 132.0* (134.0)|ML-MEK|YMEK
+YMLD|Brisbane (Maitland) 132.35* (130.9)|BN-MLD|YMLD
+YMTK|Melbourne (Mount) 133.7* (134.0)|ML-MTK|YMTK
+YMUN|Melbourne (Mungo) 132.6* (125.3)|ML-MUN|YMUN
+YMZI|Melbourne (Menzies) 134.3* (133.9)|ML-MZI|YMZI
+YNEW|Melbourne (Newman) 125.4* (134.0)|ML-NEW|YNEW
+YOCN|Brisbane (Ocean) 128.6* (130.9)|BN-OCN|YOCN
+YOLW|Melbourne (Onslow) 134.0|ML-OLW|YOLW
+YOXL|Melbourne (Oxley) 128.5* (125.3)|ML-OXL|YOXL
+YPAR|Melbourne (Paraburdoo) 133.5* (134.0)|ML-PAR|YPAR
+YPIY|Melbourne (Pingelly) 133.9|ML-PIY|YPIY
+YPOT|Melbourne (Port) 127.0* (134.0)|ML-POT|YPOT
+YSDY|Brisbane (Straddy) 134.3* (134.2)|BN-SDY|YSDY
+YSNO|Melbourne (Snowy) 124.0* (123.75)|ML-SNO|YSNO
+YSTR|Brisbane (Sturt) 134.4* (133.2)|BN-STR|YSTR
+YSWY|Brisbane (Swampy) 133.2* (120.15)|BN-SWY|YSWY
+YTAS|Melbourne (Tasmania) 123.8|ML-TAS|YTAS
+YTBD|Melbourne (Tailem Bend) 125.3|ML-TBD|YTBD
+YTBP|Brisbane (Tabletop) 120.55* (120.15)|BN-TBP|YTBP
+YTRT|Brisbane (Territory) 133.2|BN-TRT|YTRT
+YTSN|Brisbane Radio (Tasman) 124.65|BN-TSN|YTSN
+YWAR|Melbourne (Warburton) 124.9* (128.85)|ML-WAR|YWAR
+YWEG|Brisbane (Warrego) 132.45* (125.2)|BN-WEG|YWEG
+YWOL|Melbourne (Wollongong) 125.0* (129.8)|ML-WOL|YWOL
+YWON|Melbourne (Wonthaggi) 135.3* (123.75)|ML-WON|YWON
+YWRA|Melbourne (Woomera) 132.9* (128.85)|ML-WRA|YWRA
+YYWE|Melbourne (Yarrowee) 134.32* (123.75)|ML-YWE|YYWE
 ZBPE|Beijing|ZBPE|
 ZBAA|Beijing ACC - Beijing|ZBAA|
 ZBHH|Hohhot ACC (Cover 7800m and Below [ZBAA Overlap area 7800m Above]) - Beijing|ZBHH|
@@ -18456,12 +18351,13 @@ ZHHH|Wuhan ACC (Cover ZHHH 7800m and Below) - Wuhan|ZHHH|
 ZHWH|Wuhan CTR (Cover ZHCC and ZHHH 7800m and Below) - Wuhan|ZHWH|
 ZGHA|Changsha ACC (Cover ZGHA 7800m and Below [ZGGG Overlap area 7800m Above]) - Guangzhou|ZGHA|
 ZGNN|Nanning ACC - Guangzhou|ZGNN|
-ZGKL|Guilin ACC (Cover ZGKL 7800m and Below [ZGGG Overlap area 7800m Above]) - Guangzhou|ZGKL|
+ZGNN-AR08|Nanning ACC AR08/09 (Cover 7800m and Below [ZGGG Overlap area 7800m Above]) - Guangzhou|ZGNN|
 ZGZJ|Zhanjiang ACC [AR01/03(Cover 7800m and Below)][AR02(Cover 8900m and Below)] - Guangzhou|ZGZJ|
 ZGGG|Guangzhou ACC - Guangzhou|ZGGG|
 ZGZU|Guangzhou|ZGZU|
 ZJSA|Sanya ACC (ZGZJ Overlap area [AR11 7800m Above][AR12 8900m Above) Sanya|ZJSA|
 ZJSY|Sanya ACC AR01 - Sanya|ZJSY|
+ZJSA-OCA|Sanya ACC AR02/03 (Oceanic Sector) - Sanya|ZJSA|
 ZKKP|Pyongyang|ZKKP|
 ZLHW|Lanzhou|ZLHW|
 ZLLL|Lanzhou ACC - Lanzhou|ZLLL|