diff --git a/docs/controller-skills/callsigns.md b/docs/controller-skills/callsigns.md
index b84a856d..35dab840 100644
--- a/docs/controller-skills/callsigns.md
+++ b/docs/controller-skills/callsigns.md
@@ -4,7 +4,7 @@ title: Aircraft Callsigns
 
 --8<-- "includes/abbreviations.md"
 
-This page lists some of the less-known aircraft callsigns that are routinely used within the New Zealand FIR. This is not an exhaustive list, listing only New Zealand specific military or virtual airline callsigns.
+This page lists some of the aircraft callsigns that are routinely used within the New Zealand FIR. This is not an exhaustive list, listing only New Zealand specific, military or virtual airline callsigns.
 
 ## Civilian
 
@@ -13,43 +13,46 @@ This page lists some of the less-known aircraft callsigns that are routinely use
 | ADY  | Academy           | NZ ICPA                | Yes                   |
 | AHB  | Hawke             | Air Hawkes Bay         | Unsure                |
 | AMD  | Airmed            | GCH                    | Yes                   |
-| ANZ  | Air New Zealand   | Air New Zealand        | Yes                   |
-| ATT  | Air to There      | Air To There           | No                    |
+| ANZ  | New Zealand       | Air New Zealand        | Yes                   |
 | AWK  | Airwork           | Airwork                | Yes                   |
 | CAC  | Canterbury        | Canterbury Aero Club   | Unsure                |
 | CAP  | Capital           | Helilink               | Yes                   |
-| CFL  | Careflight        | Unsure                 | Unsure                |
-| CGD  | Coast Guard       | Coast Guard            | Yes                   |
+| CFL  | Careflight        | Helicopter Services    | Yes                   |
+| CGD  | Coast Guard       | Coast Guard            | Unsure                |
+| CGE  | College           | Nelson Aviation College| Yes                   | 
 | CVA  | Chatham           | Air Chathams           | Yes                   |
+| EAG  | Eagle             | Eagle Airways          | No. Superceded by ANZ |
 | FDC  | Fly Doc           | GCH Aviation           | Yes                   |
 | GBA  | Barrier           | Barrier Air            | Yes                   |
 | GBY  | Golden Bay        | Golden Bay Air         | Yes                   |
 | GIS  | GISMED            | Air Gisbourne          | Yes                   |
-| KRL  | Regional          | Kiwi Regional Airlines | No                    |
-| LFT  | Life Flight       | Life Flight Rescue     | Yes                   |
+| LFT  | Life Flight       | Air Freight NZ         | Yes                   |
 | MDK  | Medicare          | Air Whanganui          | Yes                   |
-| MDL  | Medilift          | Air Freight NZ         | Unsure                |
 | MER  | Merlin            | Merlin Labs            | Yes                   |
 | MLD  | Mainland          | Mainland Air           | Yes                   |
 | MSY  | Massey            | Massey Aviation        | Yes                   |
+| NOR  | Northern Rescue   | Northen Rescue/Westpac | Yes                   |
 | NPR  | Air Napier        | Air Napier             | Yes                   |
 | NTL  | National          | Air National           | No                    |
 | NZM  | Mount Cook        | Mount Cook Airlines    | No. Superceded by ANZ |
 | OGN  | Origin            | Origin Air             | Yes                   |
 | PLB  | Polyblue          | Polynesian Blue        | No                    |
+| PBN  | Bluebird          | Polynesian Pacific     | No                    |
 | PLC  | Police            | NZ Police              | Yes                   |
+| PHA  | Parsec            | ASL Australia          | Yes                   | 
 | QFA  | Qantas            | Qantas Airways         | Yes                   |
 | QNZ  | Qantas Jetconnect | Jetconnect             | No                    |
-| RAA  | Ridge Air         | Ridge Air              | Yes                   |
 | RLK  | Link              | Air Nelson             | No. Superceded by ANZ |
 | SAV  | Sunair            | Sunair                 | Yes                   |
+| SCR  | Southern Cross    | Jetstar                | No                    |
 | SDA  | Sounds Air        | Sounds Air             | Yes                   |
 | SKL  | Sky               | SkyLine Aviation       | Yes                   |
-| TNZ  | Texel             | Texel Air              | Yes                   |
-| VAL  | Vincent           | Vincent Aviation       | No                    |
+| SUY  | Survey            | Aerial Surveys         | Yes                   |
+| TNZ  | Texel Cargo       | Texel Air              | Yes                   |
+| TMN  | Tasman            | Tasman Cargo Airlines  | Yes                   | 
 | VOZ  | Velocity          | Virgin Australia       | Yes                   |
-| WPR  | Westpac Rescue    | Westpac Rescue         | Yes                   |
-| XFX  | Aircorp           | Airways Corporation    | Yes |
+| WPR  | Westpac Rescue    | Westpac Rescue         | No. Superceded by NOR |
+| XFX  | Aircorp           | Airways Corporation    | Yes                   |
 
 ## Military
 
@@ -58,29 +61,35 @@ This page lists some of the less-known aircraft callsigns that are routinely use
 | BOE  | Boeing             | RNZAF    |
 | KIW  | Kiwi               | RNZAF    |
 | KRC  | Kiwi Rescue        | RNZAF    |
-| POS  | Poseidon           | RNZAF    |
+| PDN  | Poseidon           | RNZAF    |
 | ORI  | Orion              | RNZAF    |
-| HER  | Hercules / Herc    | RNZAF    |
+| HER  | Herc               | RNZAF    |
 | CDT  | Cadet              | RNZAF    |
 | TEX  | Texan              | RNZAF    |
 | KAH  | Kahu               | RNZAF    |
 | FAL  | Falcon             | RNZAF    |
-| KNG  | King               | RNZAF    |
+| KNG  | King Air           | RNZAF    |
 | STG  | Stirling           | RNZAF    |
 | MAK  | Mako               | RNZAF    |
 | WRR  | Warrior            | RNZAF    |
-| SEA  | Seasprite / Sprite | RNZAF    |
+| SEA  | Seasprite          | RNZAF    |
 | IRO  | Iroquois           | RNZAF    |
 | RCH  | Reach              | USAF     |
 | ICE  | Ice                | Various  |
 | ASY  | Aussie             | RAAF     |
 
+
 ## Super Wake Turbulence Category
 
-Aircraft that fall within the `J` or 'Super' Wake Turbulence Category **must** have the RTF "Super" appended to the callsign in every transmission.
+Aircraft that fall within the `J` or 'Super' Wake Turbulence Category **must** have the RTF "Super" appended to the callsign in **every** transmission.
 
 At present, only one aircraft falls within this category - the Airbus A380 `(A388)`.
 
 !!! example "RTF Example for a Super Aircraft"
+<<<<<<< Updated upstream
     **Christchurch Approach**: *"Emirates 412 Super, continue descent via the STAR to 8,000 feet. Christchurch Information OSCAR is current."*  
-    **UAE412**: *"Descend by the STAR to 8,000 feet. We have Information OSCAR. Emirates 412 Super."*
\ No newline at end of file
+    **UAE412**: *"Descend by the STAR to 8,000 feet. We have Information OSCAR. Emirates 412 Super."*
+=======
+    **Christchurch Approach**: *"Emirates 3 Hotel Juliet Super, continue descent via the STAR to 8,000 feet. Christchurch Information OSCAR is current."*  
+    **UAE3HJ**: *"Descend by the STAR to 8,000 feet. We have Information OSCAR. Emirates 3 Hotel Juliet Super."*
+>>>>>>> Stashed changes