diff --git a/OpenSky.Agent.SimConnectMSFS/Properties/AssemblyInfo.cs b/OpenSky.Agent.SimConnectMSFS/Properties/AssemblyInfo.cs
index 2fc881d..57463c6 100644
--- a/OpenSky.Agent.SimConnectMSFS/Properties/AssemblyInfo.cs
+++ b/OpenSky.Agent.SimConnectMSFS/Properties/AssemblyInfo.cs
@@ -17,5 +17,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("1f9cbede-669d-4510-bca2-e6ad29d6a498")]
-[assembly: AssemblyVersion("0.4.5")]
-[assembly: AssemblyFileVersion("0.4.5")]
\ No newline at end of file
+[assembly: AssemblyVersion("0.5.0")]
+[assembly: AssemblyFileVersion("0.5.0")]
\ No newline at end of file
diff --git a/OpenSky.Agent.SimConnectMSFS/SimConnect.cs b/OpenSky.Agent.SimConnectMSFS/SimConnect.cs
index a97d3a4..5885d97 100644
--- a/OpenSky.Agent.SimConnectMSFS/SimConnect.cs
+++ b/OpenSky.Agent.SimConnectMSFS/SimConnect.cs
@@ -633,10 +633,10 @@ private void ReadFromSimconnect()
 
                         foreach (Requests request in Enum.GetValues(typeof(Requests)))
                         {
-                            if (this.SampleRates.ContainsKey(request))
+                            if (this.SampleRates.TryGetValue(request, out var rate))
                             {
                                 var lastTime = this.LastReceivedTimes[request];
-                                if (request != Requests.Primary && (!lastTime.HasValue || (DateTime.UtcNow - lastTime.Value).TotalMilliseconds > this.SampleRates[request]))
+                                if (request != Requests.Primary && (!lastTime.HasValue || (DateTime.UtcNow - lastTime.Value).TotalMilliseconds > rate))
                                 {
                                     this.fsConnect.RequestData(request, request);
                                 }
diff --git a/OpenSky.Agent.Simulator/OpenAPIs/ModelExtensions/AircraftType.cs b/OpenSky.Agent.Simulator/OpenAPIs/ModelExtensions/AircraftType.cs
index 00600cd..f1510b1 100644
--- a/OpenSky.Agent.Simulator/OpenAPIs/ModelExtensions/AircraftType.cs
+++ b/OpenSky.Agent.Simulator/OpenAPIs/ModelExtensions/AircraftType.cs
@@ -217,17 +217,17 @@ public bool MatchesAircraftInSimulator()
                 // Skip these checks if detailed checks are TEMPORARILY disabled
                 if (!this.DetailedChecksDisabled)
                 {
-                    if (Math.Abs(OpenSky.Agent.Simulator.Simulator.Instance.WeightAndBalance.EmptyWeight - this.EmptyWeight) > 0.5)
+                    if (Math.Abs(OpenSky.Agent.Simulator.Simulator.Instance.WeightAndBalance.EmptyWeight - this.EmptyWeight) > 0.05 * this.EmptyWeight)
                     {
                         return false;
                     }
 
-                    if (Math.Abs(OpenSky.Agent.Simulator.Simulator.Instance.WeightAndBalance.FuelTotalCapacity - this.FuelTotalCapacity) > 0.5)
+                    if (Math.Abs(OpenSky.Agent.Simulator.Simulator.Instance.WeightAndBalance.FuelTotalCapacity - this.FuelTotalCapacity) > 0.05 * this.FuelTotalCapacity)
                     {
                         return false;
                     }
 
-                    if (Math.Abs(OpenSky.Agent.Simulator.Simulator.Instance.WeightAndBalance.MaxGrossWeight - this.MaxGrossWeight) > 0.5)
+                    if (Math.Abs(OpenSky.Agent.Simulator.Simulator.Instance.WeightAndBalance.MaxGrossWeight - this.MaxGrossWeight) > 0.05 * this.MaxGrossWeight)
                     {
                         return false;
                     }
diff --git a/OpenSky.Agent.Simulator/Properties/AssemblyInfo.cs b/OpenSky.Agent.Simulator/Properties/AssemblyInfo.cs
index d347c4c..0c0dc14 100644
--- a/OpenSky.Agent.Simulator/Properties/AssemblyInfo.cs
+++ b/OpenSky.Agent.Simulator/Properties/AssemblyInfo.cs
@@ -17,5 +17,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("30c467e8-2eee-41e5-be01-0142a61ba171")]
-[assembly: AssemblyVersion("0.4.5")]
-[assembly: AssemblyFileVersion("0.4.5")]
\ No newline at end of file
+[assembly: AssemblyVersion("0.5.0")]
+[assembly: AssemblyFileVersion("0.5.0")]
\ No newline at end of file
diff --git a/OpenSky.Agent.Simulator/Simulator.Flight.cs b/OpenSky.Agent.Simulator/Simulator.Flight.cs
index 5885ad9..1befc4b 100644
--- a/OpenSky.Agent.Simulator/Simulator.Flight.cs
+++ b/OpenSky.Agent.Simulator/Simulator.Flight.cs
@@ -197,7 +197,7 @@ public Flight Flight
                     return;
                 }
 
-                Debug.WriteLine("SimConnect flight changing...");
+                Debug.WriteLine("Simulator flight changing...");
                 if (value != null && this.TrackingStatus != TrackingStatus.NotTracking)
                 {
                     Debug.WriteLine("Throwing error: You need to abort the current flight before changing to a new one!");
@@ -211,7 +211,7 @@ public Flight Flight
                 if (value != null)
                 {
                     // Start the ground handling thread for this flight
-                    new Thread(this.DoGroundHandling) { Name = "OpenSky.SimConnect.GroundHandling" }.Start();
+                    new Thread(this.DoGroundHandling) { Name = "OpenSky.Simulator.GroundHandling" }.Start();
 
                     // Add airport markers to map (do this in both new and restore, save file doesn't contain these cause the data would just be redundant)
                     UpdateGUIDelegate addAirports = () =>
diff --git a/OpenSky.Agent.Simulator/Simulator.Process.FlightPhases.cs b/OpenSky.Agent.Simulator/Simulator.Process.FlightPhases.cs
index c01ba76..72af551 100644
--- a/OpenSky.Agent.Simulator/Simulator.Process.FlightPhases.cs
+++ b/OpenSky.Agent.Simulator/Simulator.Process.FlightPhases.cs
@@ -271,7 +271,8 @@ private void TransitionFlightPhase()
             }
 
             // Departure
-            if (distanceToDepartureAirport < 10 && this.VerticalProfile == VerticalProfile.Climbing && !this.PrimaryTracking.OnGround)
+            var approachDepartureDistance = this.AircraftIdentity.EngineType is EngineType.Jet or EngineType.Turboprop ? 40 : 10;
+            if (distanceToDepartureAirport < approachDepartureDistance && this.VerticalProfile == VerticalProfile.Climbing && !this.PrimaryTracking.OnGround)
             {
                 if (unknownFlightPhase)
                 {
@@ -286,8 +287,7 @@ private void TransitionFlightPhase()
             }
 
             // Climb
-            var approachDistance = this.AircraftIdentity.EngineType is EngineType.Jet or EngineType.Turboprop ? 40 : 10;
-            if (distanceToDepartureAirport >= approachDistance && this.VerticalProfile == VerticalProfile.Climbing && !this.PrimaryTracking.OnGround)
+            if (distanceToDepartureAirport >= approachDepartureDistance && this.VerticalProfile == VerticalProfile.Climbing && !this.PrimaryTracking.OnGround)
             {
                 if (unknownFlightPhase)
                 {
@@ -302,7 +302,7 @@ private void TransitionFlightPhase()
             }
 
             // Cruise
-            if (distanceToDestinationAirport >= approachDistance && distanceToAlternateAirport >= approachDistance && this.VerticalProfile == VerticalProfile.Level && !this.PrimaryTracking.OnGround)
+            if (distanceToDestinationAirport >= approachDepartureDistance && distanceToAlternateAirport >= approachDepartureDistance && this.VerticalProfile == VerticalProfile.Level && !this.PrimaryTracking.OnGround)
             {
                 if (unknownFlightPhase)
                 {
@@ -317,7 +317,7 @@ private void TransitionFlightPhase()
             }
 
             // Descent
-            if (distanceToDestinationAirport >= approachDistance && distanceToAlternateAirport >= approachDistance && this.VerticalProfile == VerticalProfile.Descending && !this.PrimaryTracking.OnGround)
+            if (distanceToDestinationAirport >= approachDepartureDistance && distanceToAlternateAirport >= approachDepartureDistance && this.VerticalProfile == VerticalProfile.Descending && !this.PrimaryTracking.OnGround)
             {
                 if (unknownFlightPhase)
                 {
@@ -332,7 +332,7 @@ private void TransitionFlightPhase()
             }
 
             // Approach
-            if ((distanceToDestinationAirport < approachDistance || distanceToAlternateAirport < approachDistance) && !this.PrimaryTracking.OnGround && this.PrimaryTracking.RadioHeight > 500)
+            if ((distanceToDestinationAirport < approachDepartureDistance || distanceToAlternateAirport < approachDepartureDistance) && !this.PrimaryTracking.OnGround && this.PrimaryTracking.RadioHeight > 500)
             {
                 if (unknownFlightPhase)
                 {
diff --git a/OpenSky.Agent.Simulator/Simulator.Process.cs b/OpenSky.Agent.Simulator/Simulator.Process.cs
index 0f472d7..f58c156 100644
--- a/OpenSky.Agent.Simulator/Simulator.Process.cs
+++ b/OpenSky.Agent.Simulator/Simulator.Process.cs
@@ -337,6 +337,8 @@ private void ProcessLandingAnalysis()
             }
         }
 
+        private DateTime lastLocationUpdate=DateTime.MinValue;
+
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
         /// Process the primary tracking data (old vs new).
@@ -362,8 +364,9 @@ private void ProcessPrimaryTracking()
                             this.TrackFlight(ppt);
 
                             // Fire the location changed event?
-                            if (!ppt.Old.MapLocation.Equals(ppt.New.MapLocation))
+                            if (!ppt.Old.MapLocation.Equals(ppt.New.MapLocation) || (DateTime.Now-this.lastLocationUpdate).TotalSeconds>5)
                             {
+                                this.lastLocationUpdate = DateTime.Now;
                                 newLocation = ppt.New.MapLocation;
                             }
 
diff --git a/OpenSky.Agent.Simulator/Simulator.simBrief.cs b/OpenSky.Agent.Simulator/Simulator.simBrief.cs
index 9ceb7fb..8ff975c 100644
--- a/OpenSky.Agent.Simulator/Simulator.simBrief.cs
+++ b/OpenSky.Agent.Simulator/Simulator.simBrief.cs
@@ -39,6 +39,13 @@ public partial class Simulator
         /// -------------------------------------------------------------------------------------------------
         private bool simbriefOfpLoaded;
 
+        /// -------------------------------------------------------------------------------------------------
+        /// <summary>
+        /// Occurs when simbrief ofp loaded property changed.
+        /// </summary>
+        /// -------------------------------------------------------------------------------------------------
+        public event EventHandler<bool> SimbriefOfpLoadedChanged;
+
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
         /// Occurs when SimConnect adds a new simbrief waypoint marker.
@@ -64,6 +71,7 @@ private set
 
                 this.simbriefOfpLoaded = value;
                 this.OnPropertyChanged();
+                this.SimbriefOfpLoadedChanged?.Invoke(this, value);
             }
         }
 
diff --git a/OpenSky.Agent.UdpXPlane11/Properties/AssemblyInfo.cs b/OpenSky.Agent.UdpXPlane11/Properties/AssemblyInfo.cs
index fdb3420..1772465 100644
--- a/OpenSky.Agent.UdpXPlane11/Properties/AssemblyInfo.cs
+++ b/OpenSky.Agent.UdpXPlane11/Properties/AssemblyInfo.cs
@@ -17,5 +17,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("dfbda2b8-5775-4766-be86-d729fcf20de1")]
-[assembly: AssemblyVersion("0.4.5")]
-[assembly: AssemblyFileVersion("0.4.5")]
\ No newline at end of file
+[assembly: AssemblyVersion("0.5.0")]
+[assembly: AssemblyFileVersion("0.5.0")]
\ No newline at end of file
diff --git a/OpenSky.Agent.UdpXPlane11/UdpXPlane11.cs b/OpenSky.Agent.UdpXPlane11/UdpXPlane11.cs
index c2c13c4..b18dad7 100644
--- a/OpenSky.Agent.UdpXPlane11/UdpXPlane11.cs
+++ b/OpenSky.Agent.UdpXPlane11/UdpXPlane11.cs
@@ -446,10 +446,10 @@ private void ReadFromXPlane()
                             }
                             foreach (Requests request in Enum.GetValues(typeof(Requests)))
                             {
-                                if (this.SampleRates.ContainsKey(request))
+                                if (this.SampleRates.TryGetValue(request, out var rate))
                                 {
                                     var lastTime = this.LastReceivedTimes[request];
-                                    if (request != Requests.Primary && (!lastTime.HasValue || (DateTime.UtcNow - lastTime.Value).TotalMilliseconds > this.SampleRates[request]))
+                                    if (request != Requests.Primary && (!lastTime.HasValue || (DateTime.UtcNow - lastTime.Value).TotalMilliseconds > rate))
                                     {
                                         if (request == Requests.Secondary)
                                         {
diff --git a/OpenSky.Agent/App.xaml b/OpenSky.Agent/App.xaml
index f65c113..81d5a91 100644
--- a/OpenSky.Agent/App.xaml
+++ b/OpenSky.Agent/App.xaml
@@ -1,7 +1,7 @@
 <!-- 
 ====================================================================================================================
 <copyright file="Startup.xaml" company="OpenSky">
-  OpenSky project 2021-2022
+  OpenSky project 2021-2023
 </copyright>
 <summary>
   OpenSky agent main wpf application configuration
diff --git a/OpenSky.Agent/App.xaml.cs b/OpenSky.Agent/App.xaml.cs
index 943be05..97ffc8b 100644
--- a/OpenSky.Agent/App.xaml.cs
+++ b/OpenSky.Agent/App.xaml.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="App.xaml.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
@@ -301,13 +301,13 @@ private static void AppDispatcherUnhandledException(
             crashReport += "\r\n\r\n";
 
             Debug.WriteLine(crashReport);
-            var filePath = Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + "\\OpenSky.Agent.Crash.txt";
+            var filePath = Environment.ExpandEnvironmentVariables("%localappdata%\\OpenSky\\agent_crash.log");
 
             try
             {
                 File.AppendAllText(filePath, crashReport);
                 ModernWpf.MessageBox.Show(
-                    e.Exception.Message + "\r\n\r\nPlease check OpenSky.Agent.Crash.txt for details!",
+                    e.Exception.Message + "\r\n\r\nPlease check agent_crash.log for details!",
                     "Unexpected error!",
                     MessageBoxButton.OK,
                     MessageBoxImage.Error);
diff --git a/OpenSky.Agent/Controls/CustomModules/A32NX.xaml b/OpenSky.Agent/Controls/CustomModules/A32NX.xaml
index d9973ce..b8ee877 100644
--- a/OpenSky.Agent/Controls/CustomModules/A32NX.xaml
+++ b/OpenSky.Agent/Controls/CustomModules/A32NX.xaml
@@ -1,7 +1,7 @@
 <!-- 
 ====================================================================================================================
 <copyright file="A32NX.xaml" company="OpenSky">
-  OpenSky project 2021-2022
+  OpenSky project 2021-2023
 </copyright>
 <summary>
   A32NX custom module control
diff --git a/OpenSky.Agent/Controls/CustomModules/A32NX.xaml.cs b/OpenSky.Agent/Controls/CustomModules/A32NX.xaml.cs
index 8d4b8aa..4942336 100644
--- a/OpenSky.Agent/Controls/CustomModules/A32NX.xaml.cs
+++ b/OpenSky.Agent/Controls/CustomModules/A32NX.xaml.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="A32NX.xaml.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Controls/FuelTankControl.xaml b/OpenSky.Agent/Controls/FuelTankControl.xaml
index b4a6db0..46291f6 100644
--- a/OpenSky.Agent/Controls/FuelTankControl.xaml
+++ b/OpenSky.Agent/Controls/FuelTankControl.xaml
@@ -1,7 +1,7 @@
 <!-- 
 ====================================================================================================================
 <copyright file="FuelTankControl.xaml" company="OpenSky">
-  OpenSky project 2021-2022
+  OpenSky project 2021-2023
 </copyright>
 <summary>
   Fuel tank custom control
@@ -29,7 +29,7 @@
         <Rectangle Grid.Row="0" Grid.RowSpan="2" Grid.Column="0" Grid.ColumnSpan="3" Fill="#404040" Stroke="Gray" RadiusX="1.5" RadiusY="1.5" />
         <TextBlock Grid.Row="0" Grid.Column="0" Grid.RowSpan="2" VerticalAlignment="Center" Margin="5,0" Text="{Binding ElementName=FuelTank, Path=FuelTankName, Mode=OneWay}" />
         <Slider Grid.Row="0" Grid.Column="1" MinWidth="100" Margin="10,5,10,0" TickFrequency="0.5" IsSnapToTickEnabled="True" Value="{Binding ElementName=FuelTank, Path=FuelTankQuantity, Mode=TwoWay}" Maximum="{Binding ElementName=FuelTank, Path=FuelTankCapacity, Mode=OneWay}" />
-        <TextBox Grid.Row="0" Grid.Column="2" Margin="0,5,5,0" Text="{Binding ElementName=FuelTank, Path=FuelTankQuantity, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+        <TextBox Grid.Row="0" Grid.Column="2" Margin="0,5,5,0" Text="{Binding ElementName=FuelTank, Path=FuelTankQuantity, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, StringFormat=N1}" />
         <TextBlock Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Margin="0,2,5,5" FontSize="10" HorizontalAlignment="Right" Text="{Binding ElementName=FuelTank, Path=FuelTankInfo, Mode=OneWay}" />
     </Grid>
 </UserControl>
diff --git a/OpenSky.Agent/Controls/FuelTankControl.xaml.cs b/OpenSky.Agent/Controls/FuelTankControl.xaml.cs
index b8d0d0b..afc81f4 100644
--- a/OpenSky.Agent/Controls/FuelTankControl.xaml.cs
+++ b/OpenSky.Agent/Controls/FuelTankControl.xaml.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="FuelTankControl.xaml.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
@@ -21,28 +21,28 @@ public partial class FuelTankControl
         /// The fuel tangent capacity property.
         /// </summary>
         /// -------------------------------------------------------------------------------------------------
-        public static readonly DependencyProperty FuelTankCapacityProperty = DependencyProperty.Register("FuelTankCapacity", typeof(double), typeof(FuelTankControl), new UIPropertyMetadata(0.0));
+        public static readonly DependencyProperty FuelTankCapacityProperty = DependencyProperty.Register(nameof(FuelTankCapacity), typeof(double), typeof(FuelTankControl), new UIPropertyMetadata(0.0));
 
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
         /// The fuel tank name property.
         /// </summary>
         /// -------------------------------------------------------------------------------------------------
-        public static readonly DependencyProperty FuelTankNameProperty = DependencyProperty.Register("FuelTankName", typeof(string), typeof(FuelTankControl), new UIPropertyMetadata("Unknown tank"));
+        public static readonly DependencyProperty FuelTankNameProperty = DependencyProperty.Register(nameof(FuelTankName), typeof(string), typeof(FuelTankControl), new UIPropertyMetadata("Unknown tank"));
 
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
         /// The fuel tank info property.
         /// </summary>
         /// -------------------------------------------------------------------------------------------------
-        public static readonly DependencyProperty FuelTankInfoProperty = DependencyProperty.Register("FuelTankInfo", typeof(string), typeof(FuelTankControl), new UIPropertyMetadata("??"));
+        public static readonly DependencyProperty FuelTankInfoProperty = DependencyProperty.Register(nameof(FuelTankInfo), typeof(string), typeof(FuelTankControl), new UIPropertyMetadata("??"));
 
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
         /// The fuel tank quantity property.
         /// </summary>
         /// -------------------------------------------------------------------------------------------------
-        public static readonly DependencyProperty FuelTankQuantityProperty = DependencyProperty.Register("FuelTankQuantity", typeof(double), typeof(FuelTankControl), new UIPropertyMetadata(0.0));
+        public static readonly DependencyProperty FuelTankQuantityProperty = DependencyProperty.Register(nameof(FuelTankQuantity), typeof(double), typeof(FuelTankControl), new UIPropertyMetadata(0.0));
 
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
diff --git a/OpenSky.Agent/Controls/Models/ErrorDetails.cs b/OpenSky.Agent/Controls/Models/ErrorDetails.cs
index 76069f7..014340c 100644
--- a/OpenSky.Agent/Controls/Models/ErrorDetails.cs
+++ b/OpenSky.Agent/Controls/Models/ErrorDetails.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="ErrorDetails.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Controls/Models/ExtendedMessageBoxImage.cs b/OpenSky.Agent/Controls/Models/ExtendedMessageBoxImage.cs
index 2226ef8..e94b6fe 100644
--- a/OpenSky.Agent/Controls/Models/ExtendedMessageBoxImage.cs
+++ b/OpenSky.Agent/Controls/Models/ExtendedMessageBoxImage.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="ExtendedMessageBoxImage.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Controls/Models/ExtendedMessageBoxResult.cs b/OpenSky.Agent/Controls/Models/ExtendedMessageBoxResult.cs
index d024437..76b40bb 100644
--- a/OpenSky.Agent/Controls/Models/ExtendedMessageBoxResult.cs
+++ b/OpenSky.Agent/Controls/Models/ExtendedMessageBoxResult.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="ExtendedMessageBoxResult.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Controls/OpenSkyMessageBox.xaml b/OpenSky.Agent/Controls/OpenSkyMessageBox.xaml
index e90b131..57a6622 100644
--- a/OpenSky.Agent/Controls/OpenSkyMessageBox.xaml
+++ b/OpenSky.Agent/Controls/OpenSkyMessageBox.xaml
@@ -1,7 +1,7 @@
 <!-- 
 ====================================================================================================================
 <copyright file="OpenSkyMessageBox.xaml" company="OpenSky">
-  OpenSky project 2021-2022
+  OpenSky project 2021-2023
 </copyright>
 <summary>
   OpenSky message box control
diff --git a/OpenSky.Agent/Controls/OpenSkyMessageBox.xaml.cs b/OpenSky.Agent/Controls/OpenSkyMessageBox.xaml.cs
index 9f08b40..f8ec37f 100644
--- a/OpenSky.Agent/Controls/OpenSkyMessageBox.xaml.cs
+++ b/OpenSky.Agent/Controls/OpenSkyMessageBox.xaml.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="OpenSkyMessageBox.xaml.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Controls/OpenSkyNotification.xaml b/OpenSky.Agent/Controls/OpenSkyNotification.xaml
index 5caf29d..2e01f3c 100644
--- a/OpenSky.Agent/Controls/OpenSkyNotification.xaml
+++ b/OpenSky.Agent/Controls/OpenSkyNotification.xaml
@@ -1,7 +1,7 @@
 <!-- 
 ====================================================================================================================
 <copyright file="OpenSkyNotification.xaml" company="OpenSky">
-  OpenSky project 2021-2022
+  OpenSky project 2021-2023
 </copyright>
 <summary>
   OpenSky notification control
diff --git a/OpenSky.Agent/Controls/OpenSkyNotification.xaml.cs b/OpenSky.Agent/Controls/OpenSkyNotification.xaml.cs
index f21caf2..51e4593 100644
--- a/OpenSky.Agent/Controls/OpenSkyNotification.xaml.cs
+++ b/OpenSky.Agent/Controls/OpenSkyNotification.xaml.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="OpenSkyNotification.xaml.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Controls/OpenSkyWindow.cs b/OpenSky.Agent/Controls/OpenSkyWindow.cs
index 01ffc99..70d5044 100644
--- a/OpenSky.Agent/Controls/OpenSkyWindow.cs
+++ b/OpenSky.Agent/Controls/OpenSkyWindow.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="OpenSkyWindow.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Controls/PayloadStationControl.xaml b/OpenSky.Agent/Controls/PayloadStationControl.xaml
index f95d16e..c8988df 100644
--- a/OpenSky.Agent/Controls/PayloadStationControl.xaml
+++ b/OpenSky.Agent/Controls/PayloadStationControl.xaml
@@ -1,7 +1,7 @@
 <!-- 
 ====================================================================================================================
 <copyright file="PayloadStationControl.xaml" company="OpenSky">
-  OpenSky project 2021-2022
+  OpenSky project 2021-2023
 </copyright>
 <summary>
   Payload station custom control
@@ -26,6 +26,6 @@
         </Grid.ColumnDefinitions>
         <Rectangle Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Fill="#404040" Stroke="Gray" RadiusX="1.5" RadiusY="1.5" />
         <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" TextWrapping="Wrap" Margin="5,0" Text="{Binding ElementName=PayloadStation, Path=PayloadStationName, Mode=OneWay}" />
-        <TextBox Grid.Row="0" Grid.Column="1" Margin="5" Text="{Binding ElementName=PayloadStation, Path=PayloadStationWeight, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+        <TextBox Grid.Row="0" Grid.Column="1" Margin="5" Text="{Binding ElementName=PayloadStation, Path=PayloadStationWeight, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, StringFormat=N0}" />
     </Grid>
 </UserControl>
diff --git a/OpenSky.Agent/Controls/PayloadStationControl.xaml.cs b/OpenSky.Agent/Controls/PayloadStationControl.xaml.cs
index 920f272..6555304 100644
--- a/OpenSky.Agent/Controls/PayloadStationControl.xaml.cs
+++ b/OpenSky.Agent/Controls/PayloadStationControl.xaml.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="PayloadStationControl.xaml.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
@@ -21,14 +21,14 @@ public partial class PayloadStationControl
         /// The payload station name property.
         /// </summary>
         /// -------------------------------------------------------------------------------------------------
-        public static readonly DependencyProperty PayloadStationNameProperty = DependencyProperty.Register("PayloadStationName", typeof(string), typeof(PayloadStationControl), new UIPropertyMetadata("Unknown"));
+        public static readonly DependencyProperty PayloadStationNameProperty = DependencyProperty.Register(nameof(PayloadStationName), typeof(string), typeof(PayloadStationControl), new UIPropertyMetadata("Unknown"));
 
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
         /// The payload station weight property.
         /// </summary>
         /// -------------------------------------------------------------------------------------------------
-        public static readonly DependencyProperty PayloadStationWeightProperty = DependencyProperty.Register("PayloadStationWeight", typeof(double), typeof(PayloadStationControl), new UIPropertyMetadata(0.0));
+        public static readonly DependencyProperty PayloadStationWeightProperty = DependencyProperty.Register(nameof(PayloadStationWeight), typeof(double), typeof(PayloadStationControl), new UIPropertyMetadata(0.0));
 
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
@@ -61,9 +61,9 @@ public string PayloadStationName
         /// </summary>
         /// -------------------------------------------------------------------------------------------------
         [Bindable(true)]
-        public string PayloadStationWeight
+        public double PayloadStationWeight
         {
-            get => (string)this.GetValue(PayloadStationWeightProperty);
+            get => (double)this.GetValue(PayloadStationWeightProperty);
             set => this.SetValue(PayloadStationWeightProperty, value);
         }
     }
diff --git a/OpenSky.Agent/Controls/ScrollingListBox.cs b/OpenSky.Agent/Controls/ScrollingListBox.cs
index 3ba2374..405f644 100644
--- a/OpenSky.Agent/Controls/ScrollingListBox.cs
+++ b/OpenSky.Agent/Controls/ScrollingListBox.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="ScrollingListBox.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Converters/AircraftTypeEngineInfoConverter.cs b/OpenSky.Agent/Converters/AircraftTypeEngineInfoConverter.cs
index b1b8de7..b14492c 100644
--- a/OpenSky.Agent/Converters/AircraftTypeEngineInfoConverter.cs
+++ b/OpenSky.Agent/Converters/AircraftTypeEngineInfoConverter.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="AircraftTypeEngineInfoConverter.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Converters/AircraftTypeForeignKeyConverter.cs b/OpenSky.Agent/Converters/AircraftTypeForeignKeyConverter.cs
index b2f27c4..c723b48 100644
--- a/OpenSky.Agent/Converters/AircraftTypeForeignKeyConverter.cs
+++ b/OpenSky.Agent/Converters/AircraftTypeForeignKeyConverter.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="AircraftTypeForeignKeyConverter.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Converters/BooleanVisibilityConverter.cs b/OpenSky.Agent/Converters/BooleanVisibilityConverter.cs
index 1d8e0ba..f3851c8 100644
--- a/OpenSky.Agent/Converters/BooleanVisibilityConverter.cs
+++ b/OpenSky.Agent/Converters/BooleanVisibilityConverter.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="BooleanVisibilityConverter.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Converters/CanSetWeightAndBalancesConverter.cs b/OpenSky.Agent/Converters/CanSetWeightAndBalancesConverter.cs
index 931798c..a82c7e6 100644
--- a/OpenSky.Agent/Converters/CanSetWeightAndBalancesConverter.cs
+++ b/OpenSky.Agent/Converters/CanSetWeightAndBalancesConverter.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="CanSetWeightAndBalancesConverter.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Converters/CgColorConverter.cs b/OpenSky.Agent/Converters/CgColorConverter.cs
index 9e6ec57..3670907 100644
--- a/OpenSky.Agent/Converters/CgColorConverter.cs
+++ b/OpenSky.Agent/Converters/CgColorConverter.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="CgColorConverter.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Converters/CgLateralColorConverter.cs b/OpenSky.Agent/Converters/CgLateralColorConverter.cs
index a2be1c4..090599d 100644
--- a/OpenSky.Agent/Converters/CgLateralColorConverter.cs
+++ b/OpenSky.Agent/Converters/CgLateralColorConverter.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="CgLateralColorConverter.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Converters/FuelTankCapacityVisibilityConverter.cs b/OpenSky.Agent/Converters/FuelTankCapacityVisibilityConverter.cs
index 392df07..7395a89 100644
--- a/OpenSky.Agent/Converters/FuelTankCapacityVisibilityConverter.cs
+++ b/OpenSky.Agent/Converters/FuelTankCapacityVisibilityConverter.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="FuelTankCapacityVisibilityConverter.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Converters/InvertedBooleanVisibilityConverter.cs b/OpenSky.Agent/Converters/InvertedBooleanVisibilityConverter.cs
index c4acef2..ae2c588 100644
--- a/OpenSky.Agent/Converters/InvertedBooleanVisibilityConverter.cs
+++ b/OpenSky.Agent/Converters/InvertedBooleanVisibilityConverter.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="InvertedBooleanVisibilityConverter.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Converters/IsPausedButtonConverter.cs b/OpenSky.Agent/Converters/IsPausedButtonConverter.cs
index 95964b2..2ca8178 100644
--- a/OpenSky.Agent/Converters/IsPausedButtonConverter.cs
+++ b/OpenSky.Agent/Converters/IsPausedButtonConverter.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="IsPausedButtonConverter.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Converters/MapZoomLevelFontSizeConverter.cs b/OpenSky.Agent/Converters/MapZoomLevelFontSizeConverter.cs
index 784c9e3..83c3f0c 100644
--- a/OpenSky.Agent/Converters/MapZoomLevelFontSizeConverter.cs
+++ b/OpenSky.Agent/Converters/MapZoomLevelFontSizeConverter.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="MapZoomLevelFontSizeConverter.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Converters/MapZoomLevelVisibilityConverter.cs b/OpenSky.Agent/Converters/MapZoomLevelVisibilityConverter.cs
index e23be87..fdcbc54 100644
--- a/OpenSky.Agent/Converters/MapZoomLevelVisibilityConverter.cs
+++ b/OpenSky.Agent/Converters/MapZoomLevelVisibilityConverter.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="MapZoomLevelVisibilityConverter.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Converters/NullItemToVisibilityConverter.cs b/OpenSky.Agent/Converters/NullItemToVisibilityConverter.cs
index 9e92e9b..003bcb9 100644
--- a/OpenSky.Agent/Converters/NullItemToVisibilityConverter.cs
+++ b/OpenSky.Agent/Converters/NullItemToVisibilityConverter.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="NullItemToVisibilityConverter.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Converters/PayloadStationsVisibilityConverter.cs b/OpenSky.Agent/Converters/PayloadStationsVisibilityConverter.cs
index cb03871..976c2b1 100644
--- a/OpenSky.Agent/Converters/PayloadStationsVisibilityConverter.cs
+++ b/OpenSky.Agent/Converters/PayloadStationsVisibilityConverter.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="PayloadStationsVisibilityConverter.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Converters/PoundsKilogramsConverter.cs b/OpenSky.Agent/Converters/PoundsKilogramsConverter.cs
index 26d920c..8a7a730 100644
--- a/OpenSky.Agent/Converters/PoundsKilogramsConverter.cs
+++ b/OpenSky.Agent/Converters/PoundsKilogramsConverter.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="PoundsKilogramsConverter.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Converters/WeightsColorConverter.cs b/OpenSky.Agent/Converters/WeightsColorConverter.cs
index fe70d26..6042d32 100644
--- a/OpenSky.Agent/Converters/WeightsColorConverter.cs
+++ b/OpenSky.Agent/Converters/WeightsColorConverter.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="WeightsColorConverter.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/MVVM/AsynchronousCommand.cs b/OpenSky.Agent/MVVM/AsynchronousCommand.cs
index 1b44234..c37c6d1 100644
--- a/OpenSky.Agent/MVVM/AsynchronousCommand.cs
+++ b/OpenSky.Agent/MVVM/AsynchronousCommand.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="AsynchronousCommand.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/MVVM/CancelCommandEventArgs.cs b/OpenSky.Agent/MVVM/CancelCommandEventArgs.cs
index 2adc20e..78aca2d 100644
--- a/OpenSky.Agent/MVVM/CancelCommandEventArgs.cs
+++ b/OpenSky.Agent/MVVM/CancelCommandEventArgs.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="CancelCommandEventArgs.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/MVVM/Command.cs b/OpenSky.Agent/MVVM/Command.cs
index b0601cb..af2db84 100644
--- a/OpenSky.Agent/MVVM/Command.cs
+++ b/OpenSky.Agent/MVVM/Command.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="Command.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/MVVM/CommandEventArgs.cs b/OpenSky.Agent/MVVM/CommandEventArgs.cs
index 1e47014..291ce1a 100644
--- a/OpenSky.Agent/MVVM/CommandEventArgs.cs
+++ b/OpenSky.Agent/MVVM/CommandEventArgs.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="CommandEventArgs.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/MVVM/NotifyingProperty.cs b/OpenSky.Agent/MVVM/NotifyingProperty.cs
index d17946e..774caeb 100644
--- a/OpenSky.Agent/MVVM/NotifyingProperty.cs
+++ b/OpenSky.Agent/MVVM/NotifyingProperty.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="NotifyingProperty.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/MVVM/ViewModel.cs b/OpenSky.Agent/MVVM/ViewModel.cs
index 14b69c8..f9f44ae 100644
--- a/OpenSky.Agent/MVVM/ViewModel.cs
+++ b/OpenSky.Agent/MVVM/ViewModel.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="ViewModel.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Native/Mouse.cs b/OpenSky.Agent/Native/Mouse.cs
index a27c13e..aa10023 100644
--- a/OpenSky.Agent/Native/Mouse.cs
+++ b/OpenSky.Agent/Native/Mouse.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="Mouse.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Native/PInvoke/Enums/ABE.cs b/OpenSky.Agent/Native/PInvoke/Enums/ABE.cs
index 659d480..70e85f4 100644
--- a/OpenSky.Agent/Native/PInvoke/Enums/ABE.cs
+++ b/OpenSky.Agent/Native/PInvoke/Enums/ABE.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="ABE.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Native/PInvoke/Enums/ABM.cs b/OpenSky.Agent/Native/PInvoke/Enums/ABM.cs
index ecb4fcb..76b6fa5 100644
--- a/OpenSky.Agent/Native/PInvoke/Enums/ABM.cs
+++ b/OpenSky.Agent/Native/PInvoke/Enums/ABM.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="ABM.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Native/PInvoke/Enums/ABS.cs b/OpenSky.Agent/Native/PInvoke/Enums/ABS.cs
index 674c80e..8365656 100644
--- a/OpenSky.Agent/Native/PInvoke/Enums/ABS.cs
+++ b/OpenSky.Agent/Native/PInvoke/Enums/ABS.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="ABS.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Native/PInvoke/Enums/TaskbarPosition.cs b/OpenSky.Agent/Native/PInvoke/Enums/TaskbarPosition.cs
index d48fab4..11f8ba4 100644
--- a/OpenSky.Agent/Native/PInvoke/Enums/TaskbarPosition.cs
+++ b/OpenSky.Agent/Native/PInvoke/Enums/TaskbarPosition.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="TaskbarPosition.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Native/PInvoke/Gdi32.cs b/OpenSky.Agent/Native/PInvoke/Gdi32.cs
index 8a3ce91..1b843ba 100644
--- a/OpenSky.Agent/Native/PInvoke/Gdi32.cs
+++ b/OpenSky.Agent/Native/PInvoke/Gdi32.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="Gdi32.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Native/PInvoke/Shell32.cs b/OpenSky.Agent/Native/PInvoke/Shell32.cs
index 72c7179..a419cbe 100644
--- a/OpenSky.Agent/Native/PInvoke/Shell32.cs
+++ b/OpenSky.Agent/Native/PInvoke/Shell32.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="Shell32.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Native/PInvoke/Structs/AppBarData.cs b/OpenSky.Agent/Native/PInvoke/Structs/AppBarData.cs
index cde1eab..fced267 100644
--- a/OpenSky.Agent/Native/PInvoke/Structs/AppBarData.cs
+++ b/OpenSky.Agent/Native/PInvoke/Structs/AppBarData.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="AppBarData.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Native/PInvoke/Structs/Point.cs b/OpenSky.Agent/Native/PInvoke/Structs/Point.cs
index 65a0ba6..e3759b5 100644
--- a/OpenSky.Agent/Native/PInvoke/Structs/Point.cs
+++ b/OpenSky.Agent/Native/PInvoke/Structs/Point.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="Point.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Native/PInvoke/Structs/Rect.cs b/OpenSky.Agent/Native/PInvoke/Structs/Rect.cs
index e887551..0953672 100644
--- a/OpenSky.Agent/Native/PInvoke/Structs/Rect.cs
+++ b/OpenSky.Agent/Native/PInvoke/Structs/Rect.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="Rect.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
@@ -25,6 +25,7 @@ public struct Rect : IEquatable<Rect>
         /// Empty Rect structure.
         /// </summary>
         /// -------------------------------------------------------------------------------------------------
+        // ReSharper disable once UnassignedReadonlyField
         public static readonly Rect Empty;
 
         /// -------------------------------------------------------------------------------------------------
diff --git a/OpenSky.Agent/Native/PInvoke/User32.cs b/OpenSky.Agent/Native/PInvoke/User32.cs
index 3cbbccc..f33eea8 100644
--- a/OpenSky.Agent/Native/PInvoke/User32.cs
+++ b/OpenSky.Agent/Native/PInvoke/User32.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="User32.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Native/Taskbar.cs b/OpenSky.Agent/Native/Taskbar.cs
index 32604b5..afa0059 100644
--- a/OpenSky.Agent/Native/Taskbar.cs
+++ b/OpenSky.Agent/Native/Taskbar.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="Taskbar.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/OpenAPIs/AgentOpenSkyService.cs b/OpenSky.Agent/OpenAPIs/AgentOpenSkyService.cs
index 5d16d32..60e992c 100644
--- a/OpenSky.Agent/OpenAPIs/AgentOpenSkyService.cs
+++ b/OpenSky.Agent/OpenAPIs/AgentOpenSkyService.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="AgentOpenSkyService.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/OpenSky.Agent.csproj b/OpenSky.Agent/OpenSky.Agent.csproj
index cce9ccb..a65c0d3 100644
--- a/OpenSky.Agent/OpenSky.Agent.csproj
+++ b/OpenSky.Agent/OpenSky.Agent.csproj
@@ -365,19 +365,19 @@
       <Version>2.5.13</Version>
     </PackageReference>
     <PackageReference Include="DiscordRichPresence">
-      <Version>1.0.175</Version>
+      <Version>1.2.1.24</Version>
     </PackageReference>
     <PackageReference Include="Hardcodet.NotifyIcon.Wpf">
       <Version>1.1.0</Version>
     </PackageReference>
     <PackageReference Include="JetBrains.Annotations">
-      <Version>2022.1.0</Version>
+      <Version>2023.3.0</Version>
     </PackageReference>
     <PackageReference Include="MdXaml">
-      <Version>1.13.0</Version>
+      <Version>1.21.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
-      <Version>6.0.0</Version>
+      <Version>8.0.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -388,28 +388,28 @@
       <Version>0.5.2</Version>
     </PackageReference>
     <PackageReference Include="ModernWpfUI">
-      <Version>0.9.4</Version>
+      <Version>0.9.6</Version>
     </PackageReference>
     <PackageReference Include="MSFT.ParallelExtensionsExtras">
       <Version>1.2.0</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>13.0.1</Version>
+      <Version>13.0.3</Version>
     </PackageReference>
     <PackageReference Include="OpenSky.FlightLogXML">
       <Version>0.1.6</Version>
     </PackageReference>
     <PackageReference Include="Syncfusion.SfChart.WPF">
-      <Version>20.1.0.52</Version>
+      <Version>23.1.44</Version>
     </PackageReference>
     <PackageReference Include="Syncfusion.SfProgressBar.WPF">
-      <Version>20.1.0.52</Version>
+      <Version>23.1.44</Version>
     </PackageReference>
     <PackageReference Include="Syncfusion.Themes.MaterialDark.WPF">
-      <Version>20.1.0.52</Version>
+      <Version>23.1.44</Version>
     </PackageReference>
     <PackageReference Include="TomsToolbox.Wpf">
-      <Version>2.7.6</Version>
+      <Version>2.10.0</Version>
     </PackageReference>
     <PackageReference Include="XDMessaging.Lite">
       <Version>5.0.6</Version>
diff --git a/OpenSky.Agent/Properties/AssemblyInfo.cs b/OpenSky.Agent/Properties/AssemblyInfo.cs
index b86422b..c4e0140 100644
--- a/OpenSky.Agent/Properties/AssemblyInfo.cs
+++ b/OpenSky.Agent/Properties/AssemblyInfo.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="AssemblyInfo.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
@@ -16,13 +16,13 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("OpenSky")]
 [assembly: AssemblyProduct("OpenSky")]
-[assembly: AssemblyCopyright("OpenSky project 2021-2022")]
+[assembly: AssemblyCopyright("OpenSky project 2021-2023")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
-[assembly: AssemblyVersion("0.4.5")]
-[assembly: AssemblyFileVersion("0.4.5")]
+[assembly: AssemblyVersion("0.5.0")]
+[assembly: AssemblyFileVersion("0.5.0")]
 
 // This allows us to detect debug mode in XAML
 #if DEBUG
diff --git a/OpenSky.Agent/Tools/AssemblyVersionExtension.cs b/OpenSky.Agent/Tools/AssemblyVersionExtension.cs
index e1d9ba5..274c993 100644
--- a/OpenSky.Agent/Tools/AssemblyVersionExtension.cs
+++ b/OpenSky.Agent/Tools/AssemblyVersionExtension.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="AssemblyVersionExtension.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Tools/DateTimeTextWriterTraceListener.cs b/OpenSky.Agent/Tools/DateTimeTextWriterTraceListener.cs
index dbf7918..ebbc82a 100644
--- a/OpenSky.Agent/Tools/DateTimeTextWriterTraceListener.cs
+++ b/OpenSky.Agent/Tools/DateTimeTextWriterTraceListener.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="DateTimeTextWriterTraceListener.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Tools/ExceptionExtensions.cs b/OpenSky.Agent/Tools/ExceptionExtensions.cs
index b91f671..1086afd 100644
--- a/OpenSky.Agent/Tools/ExceptionExtensions.cs
+++ b/OpenSky.Agent/Tools/ExceptionExtensions.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="ExceptionExtensions.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Tools/MultiSelectExtension.cs b/OpenSky.Agent/Tools/MultiSelectExtension.cs
index 41d1d8a..1b4b116 100644
--- a/OpenSky.Agent/Tools/MultiSelectExtension.cs
+++ b/OpenSky.Agent/Tools/MultiSelectExtension.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="MultiSelectExtension.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Tools/StringValueAttribute.cs b/OpenSky.Agent/Tools/StringValueAttribute.cs
index ed88ec0..79337ba 100644
--- a/OpenSky.Agent/Tools/StringValueAttribute.cs
+++ b/OpenSky.Agent/Tools/StringValueAttribute.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="StringValueAttribute.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Tools/VisibilityAnimation.cs b/OpenSky.Agent/Tools/VisibilityAnimation.cs
index d436911..10ebbd7 100644
--- a/OpenSky.Agent/Tools/VisibilityAnimation.cs
+++ b/OpenSky.Agent/Tools/VisibilityAnimation.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="VisibilityAnimation.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Tools/WindowExtensions.cs b/OpenSky.Agent/Tools/WindowExtensions.cs
index b50445a..5476f0a 100644
--- a/OpenSky.Agent/Tools/WindowExtensions.cs
+++ b/OpenSky.Agent/Tools/WindowExtensions.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="WindowExtensions.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/UserSessionService.cs b/OpenSky.Agent/UserSessionService.cs
index 5047c6f..c554052 100644
--- a/OpenSky.Agent/UserSessionService.cs
+++ b/OpenSky.Agent/UserSessionService.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="UserSessionService.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/VectorGraphics.xaml b/OpenSky.Agent/VectorGraphics.xaml
index 7472490..d8f3564 100644
--- a/OpenSky.Agent/VectorGraphics.xaml
+++ b/OpenSky.Agent/VectorGraphics.xaml
@@ -23,6 +23,25 @@
         </DrawingImage.Drawing>
     </DrawingImage>
 
+    <DrawingImage x:Key="AircraftPositionUpForMap">
+        <DrawingImage.Drawing>
+            <DrawingGroup ClipGeometry="M0,0 V168 H154.7 V0 H0 Z">
+                <DrawingGroup Opacity="1">
+                    <GeometryDrawing Geometry="F1 M154.7,168z M0,0z M77.4,6.8C59.9,6.8 -19.6,177.8 28.9,159.8 77.4,141.8 77.4,141.8 126,159.8 174.6,177.8 94.9,6.8 77.4,6.8z">
+                        <GeometryDrawing.Brush>
+                            <SolidColorBrush Color="#FF08C6A4" Opacity="0.75" />
+                        </GeometryDrawing.Brush>
+                    </GeometryDrawing>
+                    <GeometryDrawing Geometry="F1 M154.7,168z M0,0z M77.4,6.8C59.9,6.8 -19.6,177.8 28.9,159.8 77.4,141.8 77.4,141.8 126,159.8 174.6,177.8 94.9,6.8 77.4,6.8z">
+                        <GeometryDrawing.Pen>
+                            <Pen Brush="#FFFFFFFF" Thickness="7" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
+                        </GeometryDrawing.Pen>
+                    </GeometryDrawing>
+                </DrawingGroup>
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+
     <DrawingImage x:Key="MinimizeArrow">
         <DrawingImage.Drawing>
             <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
diff --git a/OpenSky.Agent/Views/AircraftTypes.xaml b/OpenSky.Agent/Views/AircraftTypes.xaml
index 70f2fae..c8f8c7e 100644
--- a/OpenSky.Agent/Views/AircraftTypes.xaml
+++ b/OpenSky.Agent/Views/AircraftTypes.xaml
@@ -1,7 +1,7 @@
 <!-- 
 ====================================================================================================================
 <copyright file="AircraftTypes.xaml" company="OpenSky">
-  OpenSky project 2021-2022
+  OpenSky project 2021-2023
 </copyright>
 <summary>
   Aircraft types window
@@ -26,7 +26,7 @@
             mc:Ignorable="d" d:DesignWidth="2000" Loaded="AircraftTypesOnLoaded"
             Title="Aircraft Types" Height="800" Width="1400" HorizontalScrollBar="False" VerticalScrollBar="False" LoadingText="{Binding LoadingText}">
     <Window.DataContext>
-        <models:AircraftTypesViewModel />
+        <models:AircraftTypesViewModel x:Name="ViewModel" />
     </Window.DataContext>
     <Window.Resources>
         <converters:AircraftTypeEngineInfoConverter x:Key="AircraftTypeEngineInfoConverter" />
@@ -64,6 +64,7 @@
     <Window.InputBindings>
         <KeyBinding Key="F5" Command="{Binding RefreshAircraftTypesCommand}" />
         <KeyBinding Key="N" Modifiers="Control" Command="{Binding StartAddAircraftCommand}" />
+        <KeyBinding Key="U" Modifiers="Control" Command="{Binding StartUpdateAircraftCommand}" />
         <KeyBinding Key="I" Modifiers="Control" Command="{Binding IdentifyAircraftCommand}" />
     </Window.InputBindings>
     <Grid Margin="5,5,5,10">
@@ -76,6 +77,7 @@
             <ColumnDefinition Width="1*" />
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="1*" />
@@ -289,6 +291,7 @@
                         <ui:AppBarButton Icon="Clear" Label="Clear selection" ToolTip="Clear grid selection" Command="{Binding ClearTypeSelectionCommand}" />
                         <ui:AppBarButton Icon="Filter" Label="Clear all filters" ToolTip="Clear all existing aircraft types grid filters" Click="ClearAllFiltersOnClick" />
                         <ui:AppBarButton Icon="Add" Label="Add" ToolTip="Add a new aircraft type [Ctrl+N]" Command="{Binding StartAddAircraftCommand}" />
+                        <ui:AppBarButton Icon="Up" Label="Update" ToolTip="Update select aircraft type [Ctrl+U]" Command="{Binding StartUpdateAircraftCommand}" />
                         <ui:AppBarButton Icon="Accept" Label="Enable" ToolTip="Enable the selected aircraft type" Command="{Binding EnableTypeCommand}" />
                         <ui:AppBarButton Icon="Clear" Label="Disable" ToolTip="Disable the selected aircraft type" Command="{Binding DisableTypeCommand}" />
                         <ui:AppBarButton Icon="Edit" Label="Edit" ToolTip="Edit the selected aircraft type" Command="{Binding StartEditAircraftCommand}" />
@@ -297,6 +300,11 @@
                                 <ui:FontIcon Glyph="&#xE721;" />
                             </ui:AppBarButton.Icon>
                         </ui:AppBarButton>
+                        <ui:AppBarButton Label="Check upgrades" ToolTip="Check for and display available aircraft type upgrades" Command="{Binding GetAircraftUpgradesCommand}">
+                            <ui:AppBarButton.Icon>
+                                <ui:FontIcon Glyph="&#xE762;" />
+                            </ui:AppBarButton.Icon>
+                        </ui:AppBarButton>
                     </ui:CommandBar.PrimaryCommands>
                     <ui:CommandBar.SecondaryCommands>
                         <ui:AppBarButton Icon="Camera" Label="Upload image" ToolTip="Upload the aircraft type image (640x360)" Command="{Binding UploadImageCommand}" />
@@ -604,5 +612,43 @@
                 </Grid>
             </Grid>
         </GroupBox>
+        <GroupBox Grid.Column="4" Visibility="{Binding UpgradeAircraftVisibility}" tools:VisibilityAnimation.AnimationType="SlideFromRight">
+            <GroupBox.Header>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock FontSize="15" FontWeight="DemiBold">Upgrade aircraft types</TextBlock>
+                    <Button Padding="0" MinHeight="20" MaxHeight="20" Margin="5,0,0,0" Command="{Binding CloseUpgradeAircraftCommand}">✖</Button>
+                </StackPanel>
+            </GroupBox.Header>
+            <ItemsControl ItemsSource="{Binding AircraftUpgrades}">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate DataType="openSkyApi:AircraftTypeUpgrade">
+                        <Border Background="{StaticResource OpenSkyGroupboxBackgroundBrush}" BorderBrush="{StaticResource OpenSkyDarkGrayHeaderBrush}" BorderThickness="1" CornerRadius="2">
+                            <Grid Margin="10">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+
+                                <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center">From type:</TextBlock>
+                                <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center">To type:</TextBlock>
+                                <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center">#Aircraft:</TextBlock>
+
+                                <TextBlock Grid.Row="0" Grid.Column="1" FontFamily="Consolas" VerticalAlignment="Center" Margin="5,0,10,0" Text="{Binding From}" />
+                                <TextBlock Grid.Row="1" Grid.Column="1" FontFamily="Consolas" VerticalAlignment="Center" Margin="5,0,10,0" Text="{Binding To}" />
+                                <TextBlock Grid.Row="2" Grid.Column="1" FontFamily="Consolas" VerticalAlignment="Center" Margin="5,0,10,0" Text="{Binding AircraftCount}" />
+
+                                <Button Style="{StaticResource OpenSkyButtonStyle}" Grid.Row="0" Grid.RowSpan="3" Grid.Column="2" Command="{Binding UpdateAircraftTypeCommand, ElementName=ViewModel}" CommandParameter="{Binding}">Upgrade</Button>
+                            </Grid>
+                        </Border>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+        </GroupBox>
     </Grid>
 </controls:OpenSkyWindow>
diff --git a/OpenSky.Agent/Views/AircraftTypes.xaml.cs b/OpenSky.Agent/Views/AircraftTypes.xaml.cs
index 6d62da6..2cfc6c8 100644
--- a/OpenSky.Agent/Views/AircraftTypes.xaml.cs
+++ b/OpenSky.Agent/Views/AircraftTypes.xaml.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="AircraftTypes.xaml.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Views/AutoUpdate.xaml b/OpenSky.Agent/Views/AutoUpdate.xaml
index 1759d68..87c2af9 100644
--- a/OpenSky.Agent/Views/AutoUpdate.xaml
+++ b/OpenSky.Agent/Views/AutoUpdate.xaml
@@ -1,7 +1,7 @@
 <!-- 
 ====================================================================================================================
 <copyright file="AutoUpdate.xaml" company="OpenSky">
-  OpenSky project 2021-2022
+  OpenSky project 2021-2023
 </copyright>
 <summary>
   Auto update window
diff --git a/OpenSky.Agent/Views/AutoUpdate.xaml.cs b/OpenSky.Agent/Views/AutoUpdate.xaml.cs
index 3593965..0d57d07 100644
--- a/OpenSky.Agent/Views/AutoUpdate.xaml.cs
+++ b/OpenSky.Agent/Views/AutoUpdate.xaml.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="AutoUpdate.xaml.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Views/FlightTracking.xaml b/OpenSky.Agent/Views/FlightTracking.xaml
index 75b911d..2da85ae 100644
--- a/OpenSky.Agent/Views/FlightTracking.xaml
+++ b/OpenSky.Agent/Views/FlightTracking.xaml
@@ -1,7 +1,7 @@
 <!-- 
 ====================================================================================================================
 <copyright file="FlightTracking.xaml" company="OpenSky">
-  OpenSky project 2021-2022
+  OpenSky project 2021-2023
 </copyright>
 <summary>
   Flight tracking window
@@ -172,7 +172,7 @@
                 <CheckBox Grid.Row="2" Grid.Column="3" Margin="10,2,0,2" Padding="5,0" IsChecked="{Binding Simulator.TrackingConditions[2].AutoSet, Mode=TwoWay}" Visibility="{Binding Simulator.Flight.Aircraft.Type.RequiresManualLoading, Converter={StaticResource InvertedBooleanVisibilityConverter}, FallbackValue=Visible}" MinWidth="50" MinHeight="20" MaxWidth="30" MaxHeight="20">Set</CheckBox>
 
                 <CheckBox Grid.Row="3" Grid.Column="0" Style="{StaticResource RedUncheckedDisabledCheckBox}" IsEnabled="False" IsChecked="{Binding Simulator.TrackingConditions[3].ConditionMet}" MaxWidth="25" MinWidth="25"  />
-                <TextBlock Grid.Row="3" Grid.Column="1" VerticalAlignment="Center">Plane model</TextBlock>
+                <TextBlock Grid.Row="3" Grid.Column="1" VerticalAlignment="Center">Aircraft model</TextBlock>
                 <StackPanel Orientation="Vertical" Grid.Row="3" Grid.Column="2" Margin="10,0,0,0" VerticalAlignment="Center">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock Margin="5,0" FontSize="12">Sim:</TextBlock>
@@ -202,11 +202,11 @@
                     <Underline>Tips for resuming tracking while airborne:</Underline><LineBreak /><LineBreak />
                     &#x27A4; Start engines, prepare cockpit and remaining flight plan<LineBreak />
                     &#x27A4; Did you set the correct lights?<LineBreak />
-                    &#x27A4; Slew plane into position<LineBreak />
+                    &#x27A4; Slew aircraft into position<LineBreak />
                     &#x27A4; Exit slew (press Y) to adjust gear and flaps, enable AP?<LineBreak />
-                    &#x27A4; Slew plane back into position again<LineBreak />
+                    &#x27A4; Slew aircraft back into position again<LineBreak />
                     &#x27A4; "Resume tracking", starts a five second countdown<LineBreak />
-                    &#x27A4; Fly the plane &#x1F643;<LineBreak /><LineBreak />
+                    &#x27A4; Fly the aircraft &#x1F643;<LineBreak /><LineBreak />
                     If resuming on the ground you can also exit slew and resume without the five second countdown.
                 </TextBlock>
 
@@ -318,7 +318,7 @@
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="1*" />
                 </Grid.ColumnDefinitions>
-                <TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" TextWrapping="Wrap" MaxWidth="460" HorizontalAlignment="Left" Margin="0,0,0,15">While waiting for the ground crew to finish fueling and loading your plane you can start tracking your flight. You can use this time to check your plane, prepare the cockpit and run your checklists...</TextBlock>
+                <TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" TextWrapping="Wrap" MaxWidth="460" HorizontalAlignment="Left" Margin="0,0,0,15">While waiting for the ground crew to finish fueling and loading your aircraft you can start tracking your flight. You can use this time to check your aircraft, prepare the cockpit and run your checklists...</TextBlock>
                 <Rectangle Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Fill="#606060" RadiusX="1.5" RadiusY="1.5" Margin="0,1" />
                 <Rectangle Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Fill="#606060" RadiusX="1.5" RadiusY="1.5" Margin="0,1" />
                 <TextBlock Grid.Column="0" Grid.Row="1" VerticalAlignment="Center" Margin="5">Fuel loading estimated completion time</TextBlock>
@@ -512,6 +512,8 @@
                                     <Button Padding="3" Command="{Binding SetPayloadStationsCommand}" HorizontalAlignment="Stretch">Set in sim</Button>
                                 </StackPanel>
                             </Grid>
+                            <TextBlock TextWrapping="Wrap" MaxWidth="550" HorizontalAlignment="Left" Margin="5,10,5,0">Use the slider below to move the suggested payload distribution forward or aft to adjust the CG of the aircraft.</TextBlock>
+                            <Slider Margin="5,0" Value="{Binding PayloadForwardAft, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Maximum="10" />
                             <StackPanel Orientation="Vertical" Name="PayloadStationsPanel" />
                         </StackPanel>
                     </Expander>
@@ -644,7 +646,7 @@
                                 </Style.Triggers>
                             </Style>
                         </Border.Style>
-                        <CheckBox IsChecked="{Binding FollowPlane, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">Follow plane</CheckBox>
+                        <CheckBox IsChecked="{Binding FollowPlane, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">Follow aircraft</CheckBox>
                     </Border>
                     <ComboBox Name="MapType" HorizontalAlignment="Stretch" Margin="0,2,1,2" SelectionChanged="MapTypeOnSelectionChanged" SelectedValue="{Binding SelectedMapMode, Mode=OneWayToSource, UpdateSourceTrigger=PropertyChanged}">
                         <ComboBox.Items>
@@ -671,7 +673,7 @@
         <Border Grid.Row="0" Grid.Column="0" Grid.RowSpan="8" Grid.ColumnSpan="5" Background="#CC000000" Margin="-20" Visibility="{Binding NoFlightVisibility, Mode=OneWay}">
             <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
                 <TextBlock FontSize="40" HorizontalAlignment="Center">No flight ready for tracking</TextBlock>
-                <TextBlock HorizontalAlignment="Center" TextWrapping="Wrap" MaxWidth="500" Margin="0,20,0,0">Please assign a new flight from the OpenSky client or if you have the Alpha debugging client, create one using the "Test Flight" option from the main menu.</TextBlock>
+                <TextBlock HorizontalAlignment="Center" TextWrapping="Wrap" MaxWidth="500" Margin="0,20,0,0">Please start a new flight from the OpenSky client first.</TextBlock>
             </StackPanel>
         </Border>
     </Grid>
diff --git a/OpenSky.Agent/Views/FlightTracking.xaml.cs b/OpenSky.Agent/Views/FlightTracking.xaml.cs
index 49e36f5..dbdcb69 100644
--- a/OpenSky.Agent/Views/FlightTracking.xaml.cs
+++ b/OpenSky.Agent/Views/FlightTracking.xaml.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="FlightTracking.xaml.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
@@ -102,14 +102,14 @@ private void AddAircraftAndTrailsToMap()
             this.MapView.Children.Add(aircraftTrail);
 
             // Add aircraft position to map
-            var aircraftPosition = new Image { Width = 40, Height = 40 };
+            var aircraftPosition = new Image { Width = 30, Height = 30 };
             aircraftPosition.SetValue(Panel.ZIndexProperty, 999);
             aircraftPosition.SetValue(MapLayer.PositionOriginProperty, PositionOrigin.Center);
-            var rotateTransform = new RotateTransform { CenterX = 20, CenterY = 20 };
+            var rotateTransform = new RotateTransform { CenterX = 15, CenterY = 15 };
             var headingBinding = new Binding { Source = this.DataContext, Path = new PropertyPath("AircraftHeading"), Mode = BindingMode.OneWay };
             BindingOperations.SetBinding(rotateTransform, RotateTransform.AngleProperty, headingBinding);
             aircraftPosition.RenderTransform = rotateTransform;
-            var aircraftDrawingImage = this.FindResource("OpenSkyLogoPointingUpForMap") as DrawingImage;
+            var aircraftDrawingImage = this.FindResource("AircraftPositionUpForMap") as DrawingImage;
             aircraftPosition.Source = aircraftDrawingImage;
             var positionBinding = new Binding { Source = this.DataContext, Path = new PropertyPath("AircraftLocation"), Mode = BindingMode.OneWay };
             BindingOperations.SetBinding(aircraftPosition, MapLayer.PositionProperty, positionBinding);
@@ -169,11 +169,11 @@ private void FlightTrackingLoaded(object sender, RoutedEventArgs e)
             foreach (FuelTank tank in Enum.GetValues(typeof(FuelTank)))
             {
                 var control = new FuelTankControl { FuelTankName = tank.GetStringValue(), Margin = new Thickness(5, 2, 5, 2) };
-                var capacityBinding = new Binding { Source = this.DataContext, Path = new PropertyPath($"SimConnect.FuelTanks.Capacities[{(int)tank}]"), Mode = BindingMode.OneWay };
+                var capacityBinding = new Binding { Source = this.DataContext, Path = new PropertyPath($"Simulator.FuelTanks.Capacities[{(int)tank}]"), Mode = BindingMode.OneWay };
                 BindingOperations.SetBinding(control, FuelTankControl.FuelTankCapacityProperty, capacityBinding);
                 var quantityBinding = new Binding { Source = this.DataContext, Path = new PropertyPath($"FuelTankQuantities[{(int)tank}]"), Mode = BindingMode.TwoWay, UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged };
                 BindingOperations.SetBinding(control, FuelTankControl.FuelTankQuantityProperty, quantityBinding);
-                var visibilityBinding = new Binding { Source = this.DataContext, Path = new PropertyPath($"SimConnect.FuelTanks.Capacities[{(int)tank}]"), Mode = BindingMode.OneWay, Converter = new FuelTankCapacityVisibilityConverter() };
+                var visibilityBinding = new Binding { Source = this.DataContext, Path = new PropertyPath($"Simulator.FuelTanks.Capacities[{(int)tank}]"), Mode = BindingMode.OneWay, Converter = new FuelTankCapacityVisibilityConverter() };
                 BindingOperations.SetBinding(control, VisibilityProperty, visibilityBinding);
                 var infoStringBinding = new Binding { Source = this.DataContext, Path = new PropertyPath($"FuelTankInfos[{(int)tank}]"), Mode = BindingMode.OneWay };
                 BindingOperations.SetBinding(control, FuelTankControl.FuelTankInfoProperty, infoStringBinding);
@@ -181,15 +181,15 @@ private void FlightTrackingLoaded(object sender, RoutedEventArgs e)
             }
 
             // Add payload station controls
-            for (var i = 0; i < 15; i++)
+            for (var i = 0; i < 20; i++)
             {
                 var control = new PayloadStationControl { Margin = new Thickness(5, 2, 5, 2) };
-                var nameBinding = new Binding { Source = this.DataContext, Path = new PropertyPath($"SimConnect.PayloadStations.Names[{i}]"), Mode = BindingMode.OneWay };
+                var nameBinding = new Binding { Source = this.DataContext, Path = new PropertyPath($"Simulator.PayloadStations.Names[{i}]"), Mode = BindingMode.OneWay };
                 BindingOperations.SetBinding(control, PayloadStationControl.PayloadStationNameProperty, nameBinding);
                 var weightBinding = new Binding { Source = this.DataContext, Path = new PropertyPath($"PayloadStationWeights[{i}]"), Mode = BindingMode.TwoWay, UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged };
                 BindingOperations.SetBinding(control, PayloadStationControl.PayloadStationWeightProperty, weightBinding);
                 var visibilityBinding = new Binding
-                    { Source = this.DataContext, Path = new PropertyPath("SimConnect.PayloadStations.Count"), Mode = BindingMode.OneWay, Converter = new PayloadStationsVisibilityConverter(), ConverterParameter = i + 1 };
+                    { Source = this.DataContext, Path = new PropertyPath("Simulator.PayloadStations.Count"), Mode = BindingMode.OneWay, Converter = new PayloadStationsVisibilityConverter(), ConverterParameter = i + 1 };
                 BindingOperations.SetBinding(control, VisibilityProperty, visibilityBinding);
                 this.PayloadStationsPanel.Children.Add(control);
             }
diff --git a/OpenSky.Agent/Views/LandingReport.xaml b/OpenSky.Agent/Views/LandingReport.xaml
index 36803db..640d9d0 100644
--- a/OpenSky.Agent/Views/LandingReport.xaml
+++ b/OpenSky.Agent/Views/LandingReport.xaml
@@ -1,7 +1,7 @@
 <!-- 
 ====================================================================================================================
 <copyright file="FlightTracking.xaml" company="OpenSky">
-  OpenSky project 2021-2022
+  OpenSky project 2021-2023
 </copyright>
 <summary>
   Landing report notification window
diff --git a/OpenSky.Agent/Views/LandingReport.xaml.cs b/OpenSky.Agent/Views/LandingReport.xaml.cs
index 927105f..9bcfa15 100644
--- a/OpenSky.Agent/Views/LandingReport.xaml.cs
+++ b/OpenSky.Agent/Views/LandingReport.xaml.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="LandingReport.xaml.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Views/LoginNotification.xaml b/OpenSky.Agent/Views/LoginNotification.xaml
index be1ed8b..47f1b34 100644
--- a/OpenSky.Agent/Views/LoginNotification.xaml
+++ b/OpenSky.Agent/Views/LoginNotification.xaml
@@ -1,7 +1,7 @@
 <!-- 
 ====================================================================================================================
 <copyright file="LoginNotification.xaml" company="OpenSky">
-  OpenSky project 2021-2022
+  OpenSky project 2021-2023
 </copyright>
 <summary>
   Login required notification window
diff --git a/OpenSky.Agent/Views/LoginNotification.xaml.cs b/OpenSky.Agent/Views/LoginNotification.xaml.cs
index ff356e6..1c0cb76 100644
--- a/OpenSky.Agent/Views/LoginNotification.xaml.cs
+++ b/OpenSky.Agent/Views/LoginNotification.xaml.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="LoginNotification.xaml.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Views/Models/AircraftTypesViewModel.cs b/OpenSky.Agent/Views/Models/AircraftTypesViewModel.cs
index 2e3ae5c..06f8003 100644
--- a/OpenSky.Agent/Views/Models/AircraftTypesViewModel.cs
+++ b/OpenSky.Agent/Views/Models/AircraftTypesViewModel.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="AircraftTypesViewModel.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
@@ -247,11 +247,13 @@ public AircraftTypesViewModel()
             this.ExistingAircraftTypes = new ObservableCollection<AircraftType>();
             this.SelectedAircraftTypes = new ObservableCollection<AircraftType>();
             this.Manufacturers = new ObservableCollection<AircraftManufacturer>();
+            this.AircraftUpgrades = new ObservableCollection<AircraftTypeUpgrade>();
 
             this.GetUserRolesCommand = new AsynchronousCommand(this.GetUserRoles);
             this.RefreshAircraftTypesCommand = new AsynchronousCommand(this.RefreshAircraftTypes);
             this.AddAircraftTypeCommand = new AsynchronousCommand(this.AddAircraftType);
             this.StartAddAircraftCommand = new Command(this.StartAddAircraft);
+            this.StartUpdateAircraftCommand = new Command(this.StartUpdateAircraft, false);
             this.CancelAddAircraftCommand = new Command(this.CancelAddAircraft);
             this.ClearVariantOfNewCommand = new Command(this.ClearVariantOfNew);
             this.ClearTypeSelectionCommand = new Command(this.ClearTypeSelection);
@@ -268,11 +270,134 @@ public AircraftTypesViewModel()
             this.IdentifyAircraftCommand = new Command(this.IdentifyAircraft);
             this.UploadImageCommand = new AsynchronousCommand(this.UploadImage);
             this.GetAircraftManufacturersCommand = new AsynchronousCommand(this.GetAircraftManufacturers);
+            this.GetAircraftUpgradesCommand = new AsynchronousCommand(this.GetAircraftUpgrades, false);
+            this.CloseUpgradeAircraftCommand = new Command(this.CloseUpgradeAircraft);
+            this.UpdateAircraftTypeCommand = new AsynchronousCommand(this.UpdateAircraftType);
 
             this.GetUserRolesCommand.DoExecute(null);
             this.GetAircraftManufacturersCommand.DoExecute(null);
         }
 
+        /// -------------------------------------------------------------------------------------------------
+        /// <summary>
+        /// Perform the specified aircraft type upgrade.
+        /// </summary>
+        /// <remarks>
+        /// sushi.at, 29/11/2021.
+        /// </remarks>
+        /// <param name="parameter">
+        /// The parameter.
+        /// </param>
+        /// -------------------------------------------------------------------------------------------------
+        private void UpdateAircraftType(object parameter)
+        {
+            if (parameter is AircraftTypeUpgrade upgrade)
+            {
+                this.LoadingText = "Upgrading aircraft...";
+                try
+                {
+                    var result = AgentOpenSkyService.Instance.UpgradeAircraftTypeAsync(upgrade).Result;
+                    if (!result.IsError)
+                    {
+                        this.UpdateAircraftTypeCommand.ReportProgress(() => this.GetAircraftUpgradesCommand.DoExecute(null));
+                    }
+                    else
+                    {
+                        this.UpdateAircraftTypeCommand.ReportProgress(
+                            () =>
+                            {
+                                Debug.WriteLine("Error performing aircraft type upgrade: " + result.Message);
+                                if (!string.IsNullOrEmpty(result.ErrorDetails))
+                                {
+                                    Debug.WriteLine(result.ErrorDetails);
+                                }
+
+                                var notification = new OpenSkyNotification("Error performing aircraft type upgrade", result.Message, MessageBoxButton.OK, ExtendedMessageBoxImage.Error, 30);
+                                notification.SetErrorColorStyle();
+                                this.ViewReference.ShowNotification(notification);
+                            });
+                    }
+                }
+                catch (Exception ex)
+                {
+                    ex.HandleApiCallException(this.ViewReference, this.UpdateAircraftTypeCommand, "Error performing aircraft type upgrade");
+                }
+                finally
+                {
+                    this.LoadingText = null;
+                }
+            }
+        }
+
+        /// -------------------------------------------------------------------------------------------------
+        /// <summary>
+        /// Gets the update aircraft type command.
+        /// </summary>
+        /// -------------------------------------------------------------------------------------------------
+        public AsynchronousCommand UpdateAircraftTypeCommand { get; }
+
+        /// -------------------------------------------------------------------------------------------------
+        /// <summary>
+        /// The upgrade aircraft visibility.
+        /// </summary>
+        /// -------------------------------------------------------------------------------------------------
+        private Visibility upgradeAircraftVisibility = Visibility.Collapsed;
+
+        /// -------------------------------------------------------------------------------------------------
+        /// <summary>
+        /// Gets or sets the upgrade aircraft visibility.
+        /// </summary>
+        /// -------------------------------------------------------------------------------------------------
+        public Visibility UpgradeAircraftVisibility
+        {
+            get => this.upgradeAircraftVisibility;
+
+            set
+            {
+                if (Equals(this.upgradeAircraftVisibility, value))
+                {
+                    return;
+                }
+
+                this.upgradeAircraftVisibility = value;
+                this.NotifyPropertyChanged();
+            }
+        }
+
+        /// -------------------------------------------------------------------------------------------------
+        /// <summary>
+        /// Gets the close upgrade aircraft command.
+        /// </summary>
+        /// -------------------------------------------------------------------------------------------------
+        public Command CloseUpgradeAircraftCommand { get; }
+
+        /// -------------------------------------------------------------------------------------------------
+        /// <summary>
+        /// Closes the upgrade aircraft view and clears the upgrades collection.
+        /// </summary>
+        /// <remarks>
+        /// sushi.at, 29/11/2021.
+        /// </remarks>
+        /// -------------------------------------------------------------------------------------------------
+        public void CloseUpgradeAircraft()
+        {
+            this.UpgradeAircraftVisibility = Visibility.Collapsed;
+        }
+
+        /// -------------------------------------------------------------------------------------------------
+        /// <summary>
+        /// Gets the get aircraft upgrades command.
+        /// </summary>
+        /// -------------------------------------------------------------------------------------------------
+        public AsynchronousCommand GetAircraftUpgradesCommand { get; }
+
+        /// -------------------------------------------------------------------------------------------------
+        /// <summary>
+        /// Gets the aircraft upgrades.
+        /// </summary>
+        /// -------------------------------------------------------------------------------------------------
+        public ObservableCollection<AircraftTypeUpgrade> AircraftUpgrades { get; }
+
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
         /// Gets the add aircraft type command.
@@ -955,6 +1080,7 @@ public AircraftType SelectedAircraftType
                 this.selectedAircraftType = value;
                 this.NotifyPropertyChanged();
                 this.AircraftTypeDetailsVisibility = value != null ? Visibility.Visible : Visibility.Collapsed;
+                this.StartUpdateAircraftCommand.CanExecute = value != null;
 
                 if (UserSessionService.Instance.IsModerator)
                 {
@@ -1022,6 +1148,13 @@ public AircraftManufacturer SelectedManufacturer
         /// -------------------------------------------------------------------------------------------------
         public Command StartEditAircraftCommand { get; }
 
+        /// -------------------------------------------------------------------------------------------------
+        /// <summary>
+        /// Gets the start update aircraft command.
+        /// </summary>
+        /// -------------------------------------------------------------------------------------------------
+        public Command StartUpdateAircraftCommand { get; }
+
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
         /// Gets the upload image command.
@@ -1148,6 +1281,7 @@ private void AddAircraftType()
 
             if (!string.IsNullOrEmpty(this.ManufacturerDeliveryAirportICAOs))
             {
+                newAircraftType.DeliveryLocations = new List<AircraftManufacturerDeliveryLocation>();
                 var icaos = this.ManufacturerDeliveryAirportICAOs.Split(',');
                 foreach (var icao in icaos)
                 {
@@ -1164,6 +1298,13 @@ private void AddAircraftType()
                 }
             }
 
+            // The special "Missing" manufacturer was selected
+            if (this.SelectedManufacturer.Id == "miss")
+            {
+                newAircraftType.ManufacturerID = null;
+                newAircraftType.DeliveryLocations = null;
+            }
+
             this.LoadingText = "Adding new aircraft type";
             try
             {
@@ -1300,6 +1441,95 @@ private void ClearVariantOfNew()
             this.IsVariantOf = null;
         }
 
+        /// -------------------------------------------------------------------------------------------------
+        /// <summary>
+        /// Copies the selected aircraft type to be updated using the add aircraft panel.
+        /// </summary>
+        /// <remarks>
+        /// sushi.at, 20/11/2023.
+        /// </remarks>
+        /// -------------------------------------------------------------------------------------------------
+        private void CopySelectedTypeToBeUpdated()
+        {
+            this.Name = this.SelectedAircraftType.Name;
+            this.VersionNumber = this.SelectedAircraftType.VersionNumber + 1;
+            this.SelectedManufacturer = this.SelectedAircraftType.Manufacturer;
+            this.ManufacturerDeliveryAirportICAOs = this.SelectedAircraftType.ManufacturerDeliveryLocationICAOs;
+            this.Category = this.SelectedAircraftType.Category;
+            this.IsVanilla = this.SelectedAircraftType.IsVanilla;
+            this.IncludeInWorldPopulation = this.SelectedAircraftType.IncludeInWorldPopulation;
+            this.NeedsCoPilot = this.SelectedAircraftType.NeedsCoPilot;
+            this.NeedsFlightEngineer = this.SelectedAircraftType.NeedsFlightEngineer;
+            this.RequiresManualFuelling = this.SelectedAircraftType.RequiresManualFuelling;
+            this.RequiresManualLoading = this.SelectedAircraftType.RequiresManualLoading;
+            this.MinimumRunwayLength = this.SelectedAircraftType.MinimumRunwayLength;
+            this.MinimumPrice = this.SelectedAircraftType.MinPrice;
+            this.MaximumPrice = this.SelectedAircraftType.MaxPrice;
+            this.MaxPayloadDeltaAllowed = this.SelectedAircraftType.MaxPayloadDeltaAllowed;
+            this.Comments = this.SelectedAircraftType.Comments;
+            this.EngineModel = this.SelectedAircraftType.EngineModel;
+            this.OverrideFuelType = this.SelectedAircraftType.OverrideFuelType;
+            this.IsHistoric = this.SelectedAircraftType.IsHistoric;
+
+            this.AddAircraftVisibility = Visibility.Visible;
+        }
+
+        /// -------------------------------------------------------------------------------------------------
+        /// <summary>
+        /// Gets the available aircraft upgrades.
+        /// </summary>
+        /// <remarks>
+        /// sushi.at, 29/11/2021.
+        /// </remarks>
+        /// -------------------------------------------------------------------------------------------------
+        private void GetAircraftUpgrades()
+        {
+            if (!UserSessionService.Instance.IsModerator)
+            {
+                return;
+            }
+
+            this.LoadingText = "Checking for available aircraft type upgrades...";
+            try
+            {
+                var result = AgentOpenSkyService.Instance.GetAircraftTypeUpgradesAsync().Result;
+                if (!result.IsError)
+                {
+                    this.GetAircraftUpgradesCommand.ReportProgress(
+                        () =>
+                        {
+                            this.AircraftUpgrades.Clear();
+                            this.AircraftUpgrades.AddRange(result.Data);
+                            this.UpgradeAircraftVisibility = Visibility.Visible;
+                        });
+                }
+                else
+                {
+                    this.GetAircraftUpgradesCommand.ReportProgress(
+                        () =>
+                        {
+                            Debug.WriteLine("Error checking for aircraft type upgrades: " + result.Message);
+                            if (!string.IsNullOrEmpty(result.ErrorDetails))
+                            {
+                                Debug.WriteLine(result.ErrorDetails);
+                            }
+
+                            var notification = new OpenSkyNotification("Error checking for aircraft type upgrades", result.Message, MessageBoxButton.OK, ExtendedMessageBoxImage.Error, 30);
+                            notification.SetErrorColorStyle();
+                            this.ViewReference.ShowNotification(notification);
+                        });
+                }
+            }
+            catch (Exception ex)
+            {
+                ex.HandleApiCallException(this.ViewReference, this.GetAircraftUpgradesCommand, "Error checking for aircraft type upgrades");
+            }
+            finally
+            {
+                this.LoadingText = null;
+            }
+        }
+
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
         /// Deletes the selected aircraft type.
@@ -1677,6 +1907,7 @@ private void GetUserRoles()
             if (result)
             {
                 this.GetUserRolesCommand.ReportProgress(() => this.RefreshAircraftTypesCommand.DoExecute(null));
+                this.GetAircraftUpgradesCommand.CanExecute = UserSessionService.Instance.IsModerator;
             }
             else
             {
@@ -1686,6 +1917,8 @@ private void GetUserRoles()
                         var notification = new OpenSkyNotification("Error", "Error fetching your user roles.", MessageBoxButton.OK, ExtendedMessageBoxImage.Error, 30);
                         notification.SetErrorColorStyle();
                         this.ViewReference.ShowNotification(notification);
+
+                        this.GetAircraftUpgradesCommand.CanExecute = false;
                     });
             }
 
@@ -1750,7 +1983,7 @@ private void RefreshAircraftTypes()
                         () =>
                         {
                             this.ExistingAircraftTypes.Clear();
-                            foreach (var type in result.Data)
+                            foreach (var type in result.Data.OrderBy(t => t.Name).ThenBy(t => t.VersionNumber))
                             {
                                 this.ExistingAircraftTypes.Add(type);
                             }
@@ -1966,6 +2199,56 @@ private void StartEditAircraft()
             this.ManufacturerDeliveryAirportICAOs = this.ManufacturerDeliveryAirportICAOs.TrimEnd(',');
         }
 
+        /// -------------------------------------------------------------------------------------------------
+        /// <summary>
+        /// Starts updating the selected aircraft type.
+        /// </summary>
+        /// <remarks>
+        /// sushi.at, 20/11/2023.
+        /// </remarks>
+        /// -------------------------------------------------------------------------------------------------
+        private void StartUpdateAircraft()
+        {
+            if (!this.Simulator.Connected)
+            {
+                var notification = new OpenSkyNotification("Update aircraft type", "Not connected to sim!", MessageBoxButton.OK, ExtendedMessageBoxImage.Error, 30);
+                notification.SetErrorColorStyle();
+                this.ViewReference.ShowNotification(notification);
+                return;
+            }
+
+            AircraftType matchedType = null;
+            foreach (var type in this.ExistingAircraftTypes)
+            {
+                if (type.MatchesAircraftInSimulator())
+                {
+                    matchedType = type;
+                    break;
+                }
+            }
+
+            if (matchedType != null)
+            {
+                var messageBox = new OpenSkyMessageBox(
+                    "Update aircraft type",
+                    $"The aircraft currently loaded in the sim seems to be a match for the existing type: {matchedType}\r\n\r\nAre you sure you an update is necessary?",
+                    MessageBoxButton.YesNo,
+                    ExtendedMessageBoxImage.Question);
+                messageBox.Closed += (_, _) =>
+                {
+                    if (messageBox.Result == ExtendedMessageBoxResult.Yes)
+                    {
+                        this.CopySelectedTypeToBeUpdated();
+                    }
+                };
+                this.ViewReference.ShowMessageBox(messageBox);
+            }
+            else
+            {
+                this.CopySelectedTypeToBeUpdated();
+            }
+        }
+
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
         /// Upload aircraft type image.
diff --git a/OpenSky.Agent/Views/Models/AutoUpdateViewModel.cs b/OpenSky.Agent/Views/Models/AutoUpdateViewModel.cs
index eb5a0de..76a9e29 100644
--- a/OpenSky.Agent/Views/Models/AutoUpdateViewModel.cs
+++ b/OpenSky.Agent/Views/Models/AutoUpdateViewModel.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="AutoUpdateViewModel.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Views/Models/FlightTrackingViewModel.CustomModules.cs b/OpenSky.Agent/Views/Models/FlightTrackingViewModel.CustomModules.cs
index 41074cf..a20c757 100644
--- a/OpenSky.Agent/Views/Models/FlightTrackingViewModel.CustomModules.cs
+++ b/OpenSky.Agent/Views/Models/FlightTrackingViewModel.CustomModules.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="FlightTrackingViewModel.CustomModules.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Views/Models/FlightTrackingViewModel.FuelTanks.cs b/OpenSky.Agent/Views/Models/FlightTrackingViewModel.FuelTanks.cs
index f46e4d0..e17fdc5 100644
--- a/OpenSky.Agent/Views/Models/FlightTrackingViewModel.FuelTanks.cs
+++ b/OpenSky.Agent/Views/Models/FlightTrackingViewModel.FuelTanks.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="FlightTrackingViewModel.FuelTanks.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Views/Models/FlightTrackingViewModel.Graphs.cs b/OpenSky.Agent/Views/Models/FlightTrackingViewModel.Graphs.cs
index efc5585..d8d6ade 100644
--- a/OpenSky.Agent/Views/Models/FlightTrackingViewModel.Graphs.cs
+++ b/OpenSky.Agent/Views/Models/FlightTrackingViewModel.Graphs.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="FlightTrackingViewModel.Graphs.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Views/Models/FlightTrackingViewModel.Map.cs b/OpenSky.Agent/Views/Models/FlightTrackingViewModel.Map.cs
index beec208..604aed8 100644
--- a/OpenSky.Agent/Views/Models/FlightTrackingViewModel.Map.cs
+++ b/OpenSky.Agent/Views/Models/FlightTrackingViewModel.Map.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="FlightTrackingViewModel.Map.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Views/Models/FlightTrackingViewModel.PayloadStations.cs b/OpenSky.Agent/Views/Models/FlightTrackingViewModel.PayloadStations.cs
index 7c50adf..1bb8453 100644
--- a/OpenSky.Agent/Views/Models/FlightTrackingViewModel.PayloadStations.cs
+++ b/OpenSky.Agent/Views/Models/FlightTrackingViewModel.PayloadStations.cs
@@ -1,12 +1,13 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="FlightTrackingViewModel.PayloadStations.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
 namespace OpenSky.Agent.Views.Models
 {
     using System;
+    using System.Collections.Generic;
     using System.Collections.ObjectModel;
     using System.Diagnostics;
 
@@ -33,6 +34,35 @@ public partial class FlightTrackingViewModel
         /// -------------------------------------------------------------------------------------------------
         private bool isPayloadExpanded;
 
+        /// -------------------------------------------------------------------------------------------------
+        /// <summary>
+        /// The payload forward/aft distribution slider value.
+        /// </summary>
+        /// -------------------------------------------------------------------------------------------------
+        private double payloadForwardAft = 5;
+
+        /// -------------------------------------------------------------------------------------------------
+        /// <summary>
+        /// Gets or sets the payload forward/aft distribution slider value.
+        /// </summary>
+        /// -------------------------------------------------------------------------------------------------
+        public double PayloadForwardAft
+        {
+            get => this.payloadForwardAft;
+        
+            set
+            {
+                if(Equals(this.payloadForwardAft, value))
+                {
+                   return;
+                }
+        
+                this.payloadForwardAft = value;
+                this.NotifyPropertyChanged();
+                this.SuggestPayloadCommand.DoExecute(null);
+            }
+        }
+
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
         /// Gets or sets a value indicating whether the payload section is expanded or not.
@@ -143,7 +173,7 @@ private void SuggestPayload()
             var nonPilotStations = 0;
             for (var i = 0; i < this.Simulator.PayloadStations.Count; i++)
             {
-                if (this.Simulator.PayloadStations.Names[i].Contains("PILOT"))
+                if (this.Simulator.PayloadStations.Names[i].ToLowerInvariant().Contains("pilot"))
                 {
                     var payload = Math.Min(170, payloadToLoad);
                     this.PayloadStationWeights[i] = payload;
@@ -155,20 +185,34 @@ private void SuggestPayload()
                 }
             }
 
-            // Distribute the rest evenly
+            // Distribute the rest evenly, taking the CG slider value into consideration
+            var nonPilotOverride = false;
             if (nonPilotStations == 0)
             {
                 nonPilotStations = this.Simulator.PayloadStations.Count;
+                nonPilotOverride = true;
             }
 
             if (nonPilotStations > 0)
             {
                 var payloadShare = payloadToLoad / nonPilotStations;
+                var payloadMultipliers = new List<double>();
+
+                var startValue = 2 - (this.PayloadForwardAft * 0.2);
+                var endValue = 2 - startValue;
+                var step = (endValue - startValue) / (nonPilotStations - 1);
+                for (var i = 0; i < nonPilotStations; i++)
+                {
+                    payloadMultipliers.Add(startValue);
+                    startValue += step;
+                }
+
+                var nonPilotIndex = 0;
                 for (var i = 0; i < this.Simulator.PayloadStations.Count; i++)
                 {
-                    if (!this.Simulator.PayloadStations.Names[i].Contains("PILOT"))
+                    if (!this.Simulator.PayloadStations.Names[i].ToLowerInvariant().Contains("pilot") || nonPilotOverride)
                     {
-                        this.PayloadStationWeights[i] = payloadShare;
+                        this.PayloadStationWeights[i] = payloadShare * payloadMultipliers[nonPilotIndex++];
                         payloadToLoad -= payloadShare;
                     }
                 }
diff --git a/OpenSky.Agent/Views/Models/FlightTrackingViewModel.cs b/OpenSky.Agent/Views/Models/FlightTrackingViewModel.cs
index 7ed7f40..06e4797 100644
--- a/OpenSky.Agent/Views/Models/FlightTrackingViewModel.cs
+++ b/OpenSky.Agent/Views/Models/FlightTrackingViewModel.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="FlightTrackingViewModel.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
@@ -89,6 +89,13 @@ public partial class FlightTrackingViewModel : ViewModel
         /// -------------------------------------------------------------------------------------------------
         private string showHideOFPButtonText = "Show OFP";
 
+        /// -------------------------------------------------------------------------------------------------
+        /// <summary>
+        /// The skip ground handling visibility.
+        /// </summary>
+        /// -------------------------------------------------------------------------------------------------
+        private Visibility skipGroundHandlingVisibility = Visibility.Collapsed;
+
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
         /// The start/resume tracking button text.
@@ -124,36 +131,6 @@ public partial class FlightTrackingViewModel : ViewModel
         /// -------------------------------------------------------------------------------------------------
         private Visibility weightAndBalancesVisibility = Visibility.Visible;
 
-        /// -------------------------------------------------------------------------------------------------
-        /// <summary>
-        /// The skip ground handling visibility.
-        /// </summary>
-        /// -------------------------------------------------------------------------------------------------
-        private Visibility skipGroundHandlingVisibility = Visibility.Collapsed;
-
-        /// -------------------------------------------------------------------------------------------------
-        /// <summary>
-        /// Gets or sets the skip ground handling visibility.
-        /// </summary>
-        /// -------------------------------------------------------------------------------------------------
-        public Visibility SkipGroundHandlingVisibility
-        {
-            get => this.skipGroundHandlingVisibility;
-
-            set
-            {
-                if (Equals(this.skipGroundHandlingVisibility, value))
-                {
-                    return;
-                }
-
-                this.skipGroundHandlingVisibility = value;
-                this.NotifyPropertyChanged();
-            }
-        }
-
-
-
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
         /// Initializes a new instance of the <see cref="FlightTrackingViewModel"/> class.
@@ -188,6 +165,7 @@ public FlightTrackingViewModel()
             this.Simulator.TrackingStatusChanged += this.SimulatorTrackingStatusChanged;
             this.Simulator.FlightChanged += this.SimulatortFlightChanged;
             this.Simulator.LocationChanged += this.SimulatorLocationChanged;
+            this.Simulator.SimbriefOfpLoadedChanged += this.SimulatorOfpLoadedChanged;
 
             // Create commands
             this.SetFuelAndPayloadCommand = new Command(this.SetFuelAndPayload);
@@ -421,6 +399,27 @@ public string ShowHideOFPButtonText
         /// -------------------------------------------------------------------------------------------------
         public Command SkipGroundHandlingCommand { get; }
 
+        /// -------------------------------------------------------------------------------------------------
+        /// <summary>
+        /// Gets or sets the skip ground handling visibility.
+        /// </summary>
+        /// -------------------------------------------------------------------------------------------------
+        public Visibility SkipGroundHandlingVisibility
+        {
+            get => this.skipGroundHandlingVisibility;
+
+            set
+            {
+                if (Equals(this.skipGroundHandlingVisibility, value))
+                {
+                    return;
+                }
+
+                this.skipGroundHandlingVisibility = value;
+                this.NotifyPropertyChanged();
+            }
+        }
+
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
         /// Gets the slew into position command.
@@ -602,10 +601,7 @@ private void AbortFlight()
                         MessageBoxButton.YesNo,
                         ExtendedMessageBoxImage.Hand);
                     messageBox.SetWarningColorStyle();
-                    messageBox.Closed += (_, _) =>
-                    {
-                        answer = messageBox.Result;
-                    };
+                    messageBox.Closed += (_, _) => { answer = messageBox.Result; };
                     this.ViewReference.ShowMessageBox(messageBox);
                 });
             while (answer == null && !SleepScheduler.IsShutdownInProgress)
@@ -650,6 +646,25 @@ private void SetFuelAndPayload()
             this.SetPayloadStations();
         }
 
+        /// -------------------------------------------------------------------------------------------------
+        /// <summary>
+        /// Simulator ofp loaded changed.
+        /// </summary>
+        /// <remarks>
+        /// sushi.at, 18/11/2023.
+        /// </remarks>
+        /// <param name="sender">
+        /// Source of the event.
+        /// </param>
+        /// <param name="loaded">
+        /// True if the data was loaded.
+        /// </param>
+        /// -------------------------------------------------------------------------------------------------
+        private void SimulatorOfpLoadedChanged(object sender, bool loaded)
+        {
+            this.ImportSimbriefVisibility = loaded ? Visibility.Collapsed : Visibility.Visible;
+        }
+
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
         /// Simulator flight changed.
@@ -851,12 +866,13 @@ private void SlewIntoPosition()
             catch (Exception ex)
             {
                 Debug.WriteLine("Error slewing plane into position: " + ex);
-                this.SlewIntoPositionCommand.ReportProgress(() =>
-                {
-                    var notification = new OpenSkyNotification(new ErrorDetails { DetailedMessage = ex.Message, Exception = ex }, "Error slewing into position", ex.Message, ExtendedMessageBoxImage.Error, 30);
-                    notification.SetErrorColorStyle();
-                    this.ViewReference.ShowNotification(notification);
-                });
+                this.SlewIntoPositionCommand.ReportProgress(
+                    () =>
+                    {
+                        var notification = new OpenSkyNotification(new ErrorDetails { DetailedMessage = ex.Message, Exception = ex }, "Error slewing into position", ex.Message, ExtendedMessageBoxImage.Error, 30);
+                        notification.SetErrorColorStyle();
+                        this.ViewReference.ShowNotification(notification);
+                    });
             }
         }
 
@@ -895,12 +911,13 @@ private void StartTracking()
                     if (!this.Simulator.CanStartTracking)
                     {
                         Debug.WriteLine("Tracking conditions not met");
-                        this.StartTrackingCommand.ReportProgress(() =>
-                        {
-                            var notification = new OpenSkyNotification("Start tracking", "Not all tracking conditions are met, please review, correct and try again.", MessageBoxButton.OK, ExtendedMessageBoxImage.Warning, 10);
-                            notification.SetWarningColorStyle();
-                            this.ViewReference.ShowNotification(notification);
-                        });
+                        this.StartTrackingCommand.ReportProgress(
+                            () =>
+                            {
+                                var notification = new OpenSkyNotification("Start tracking", "Not all tracking conditions are met, please review, correct and try again.", MessageBoxButton.OK, ExtendedMessageBoxImage.Warning, 10);
+                                notification.SetWarningColorStyle();
+                                this.ViewReference.ShowNotification(notification);
+                            });
                         this.StartTrackingCommand.ReportProgress(() => this.StartTrackingCommand.CanExecute = true);
                         return;
                     }
@@ -943,10 +960,7 @@ private void StartTracking()
                                     MessageBoxButton.YesNo,
                                     ExtendedMessageBoxImage.Warning);
                                 messageBox.SetWarningColorStyle();
-                                messageBox.Closed += (_, _) =>
-                                {
-                                    answer = messageBox.Result;
-                                };
+                                messageBox.Closed += (_, _) => { answer = messageBox.Result; };
                                 this.ViewReference.ShowMessageBox(messageBox);
                             });
                         while (answer == null && !SleepScheduler.IsShutdownInProgress)
@@ -974,10 +988,7 @@ private void StartTracking()
                                     MessageBoxButton.YesNo,
                                     ExtendedMessageBoxImage.Warning);
                                 messageBox.SetWarningColorStyle();
-                                messageBox.Closed += (_, _) =>
-                                {
-                                    answer = messageBox.Result;
-                                };
+                                messageBox.Closed += (_, _) => { answer = messageBox.Result; };
                                 this.ViewReference.ShowMessageBox(messageBox);
                             });
                         while (answer == null && !SleepScheduler.IsShutdownInProgress)
@@ -1005,10 +1016,7 @@ private void StartTracking()
                                     MessageBoxButton.YesNo,
                                     ExtendedMessageBoxImage.Warning);
                                 messageBox.SetWarningColorStyle();
-                                messageBox.Closed += (_, _) =>
-                                {
-                                    answer = messageBox.Result;
-                                };
+                                messageBox.Closed += (_, _) => { answer = messageBox.Result; };
                                 this.ViewReference.ShowMessageBox(messageBox);
                             });
                         while (answer == null && !SleepScheduler.IsShutdownInProgress)
@@ -1035,10 +1043,7 @@ private void StartTracking()
                                     "The total weight exceeds the limits specified for this plane, are you sure you want to continue?",
                                     MessageBoxButton.YesNo,
                                     ExtendedMessageBoxImage.Question);
-                                messageBox.Closed += (_, _) =>
-                                {
-                                    answer = messageBox.Result;
-                                };
+                                messageBox.Closed += (_, _) => { answer = messageBox.Result; };
                                 this.ViewReference.ShowMessageBox(messageBox);
                             });
                         while (answer == null && !SleepScheduler.IsShutdownInProgress)
@@ -1065,10 +1070,7 @@ private void StartTracking()
                                     "Ground handling not yet completed, do you want to skip it?",
                                     MessageBoxButton.YesNo,
                                     ExtendedMessageBoxImage.Question);
-                                messageBox.Closed += (_, _) =>
-                                {
-                                    answer = messageBox.Result;
-                                };
+                                messageBox.Closed += (_, _) => { answer = messageBox.Result; };
                                 this.ViewReference.ShowMessageBox(messageBox);
                             });
                         while (answer == null && !SleepScheduler.IsShutdownInProgress)
@@ -1099,12 +1101,13 @@ private void StartTracking()
                     if (!this.Simulator.CanStartTracking)
                     {
                         Debug.WriteLine("Tracking conditions not met");
-                        this.StartTrackingCommand.ReportProgress(() =>
-                        {
-                            var notification = new OpenSkyNotification("Start tracking", "Not all tracking conditions are met, please review, correct and try again.", MessageBoxButton.OK, ExtendedMessageBoxImage.Warning, 10);
-                            notification.SetWarningColorStyle();
-                            this.ViewReference.ShowNotification(notification);
-                        });
+                        this.StartTrackingCommand.ReportProgress(
+                            () =>
+                            {
+                                var notification = new OpenSkyNotification("Start tracking", "Not all tracking conditions are met, please review, correct and try again.", MessageBoxButton.OK, ExtendedMessageBoxImage.Warning, 10);
+                                notification.SetWarningColorStyle();
+                                this.ViewReference.ShowNotification(notification);
+                            });
                         this.StartTrackingCommand.ReportProgress(() => this.StartTrackingCommand.CanExecute = true);
                         return;
                     }
@@ -1153,12 +1156,13 @@ private void StartTracking()
             catch (Exception ex)
             {
                 Debug.WriteLine("Error starting/resuming tracking: " + ex);
-                this.StartTrackingCommand.ReportProgress(() =>
-                {
-                    var notification = new OpenSkyNotification(new ErrorDetails { DetailedMessage = ex.Message, Exception = ex }, "Error starting tracking", ex.Message, ExtendedMessageBoxImage.Error, 30);
-                    notification.SetErrorColorStyle();
-                    this.ViewReference.ShowNotification(notification);
-                });
+                this.StartTrackingCommand.ReportProgress(
+                    () =>
+                    {
+                        var notification = new OpenSkyNotification(new ErrorDetails { DetailedMessage = ex.Message, Exception = ex }, "Error starting tracking", ex.Message, ExtendedMessageBoxImage.Error, 30);
+                        notification.SetErrorColorStyle();
+                        this.ViewReference.ShowNotification(notification);
+                    });
                 this.StartTrackingCommand.ReportProgress(() => this.StartTrackingCommand.CanExecute = true);
             }
         }
@@ -1184,10 +1188,7 @@ private void StopTracking()
                         MessageBoxButton.YesNoCancel,
                         ExtendedMessageBoxImage.Hand);
                     messageBox.SetWarningColorStyle();
-                    messageBox.Closed += (_, _) =>
-                    {
-                        answer = messageBox.Result;
-                    };
+                    messageBox.Closed += (_, _) => { answer = messageBox.Result; };
                     this.ViewReference.ShowMessageBox(messageBox);
                 });
             while (answer == null && !SleepScheduler.IsShutdownInProgress)
@@ -1209,12 +1210,13 @@ private void StopTracking()
                 catch (Exception ex)
                 {
                     Debug.WriteLine("Error saving flight: " + ex);
-                    this.StopTrackingCommand.ReportProgress(() =>
-                    {
-                        var notification = new OpenSkyNotification(new ErrorDetails { DetailedMessage = ex.Message, Exception = ex }, "Error saving flight", ex.Message, ExtendedMessageBoxImage.Error, 30);
-                        notification.SetErrorColorStyle();
-                        this.ViewReference.ShowNotification(notification);
-                    });
+                    this.StopTrackingCommand.ReportProgress(
+                        () =>
+                        {
+                            var notification = new OpenSkyNotification(new ErrorDetails { DetailedMessage = ex.Message, Exception = ex }, "Error saving flight", ex.Message, ExtendedMessageBoxImage.Error, 30);
+                            notification.SetErrorColorStyle();
+                            this.ViewReference.ShowNotification(notification);
+                        });
                 }
             }
             else
@@ -1231,12 +1233,13 @@ private void StopTracking()
                 catch (Exception ex)
                 {
                     Debug.WriteLine("Error stopping tracking: " + ex);
-                    this.StopTrackingCommand.ReportProgress(() =>
-                    {
-                        var notification = new OpenSkyNotification(new ErrorDetails { DetailedMessage = ex.Message, Exception = ex }, "Error stopping tracking", ex.Message, ExtendedMessageBoxImage.Error, 30);
-                        notification.SetErrorColorStyle();
-                        this.ViewReference.ShowNotification(notification);
-                    });
+                    this.StopTrackingCommand.ReportProgress(
+                        () =>
+                        {
+                            var notification = new OpenSkyNotification(new ErrorDetails { DetailedMessage = ex.Message, Exception = ex }, "Error stopping tracking", ex.Message, ExtendedMessageBoxImage.Error, 30);
+                            notification.SetErrorColorStyle();
+                            this.ViewReference.ShowNotification(notification);
+                        });
                 }
             }
         }
@@ -1273,13 +1276,13 @@ private void ToggleFlightPause()
             catch (Exception ex)
             {
                 Debug.WriteLine("Error pausing/resuming sim: " + ex);
-                this.ToggleFlightPauseCommand.ReportProgress(() =>
-                {
-                    var notification = new OpenSkyNotification(new ErrorDetails { DetailedMessage = ex.Message, Exception = ex }, "Error pausing/resuming simulator", ex.Message, ExtendedMessageBoxImage.Error, 30);
-                    notification.SetErrorColorStyle();
-                    this.ViewReference.ShowNotification(notification);
-                });
-
+                this.ToggleFlightPauseCommand.ReportProgress(
+                    () =>
+                    {
+                        var notification = new OpenSkyNotification(new ErrorDetails { DetailedMessage = ex.Message, Exception = ex }, "Error pausing/resuming simulator", ex.Message, ExtendedMessageBoxImage.Error, 30);
+                        notification.SetErrorColorStyle();
+                        this.ViewReference.ShowNotification(notification);
+                    });
             }
         }
 
diff --git a/OpenSky.Agent/Views/Models/LandingReportViewModel.cs b/OpenSky.Agent/Views/Models/LandingReportViewModel.cs
index d7a9ab5..9858ab6 100644
--- a/OpenSky.Agent/Views/Models/LandingReportViewModel.cs
+++ b/OpenSky.Agent/Views/Models/LandingReportViewModel.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="LandingReportViewModel.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Views/Models/LoginNotificationViewModel.cs b/OpenSky.Agent/Views/Models/LoginNotificationViewModel.cs
index 19667b9..4f9f8e4 100644
--- a/OpenSky.Agent/Views/Models/LoginNotificationViewModel.cs
+++ b/OpenSky.Agent/Views/Models/LoginNotificationViewModel.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="LoginNotificationViewModel.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Views/Models/NewFlightNotificationViewModel.cs b/OpenSky.Agent/Views/Models/NewFlightNotificationViewModel.cs
index feea70c..acf4e8c 100644
--- a/OpenSky.Agent/Views/Models/NewFlightNotificationViewModel.cs
+++ b/OpenSky.Agent/Views/Models/NewFlightNotificationViewModel.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="NewFlightNotificationViewModel.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Views/Models/SettingsViewModel.cs b/OpenSky.Agent/Views/Models/SettingsViewModel.cs
index ce5fc21..07b534c 100644
--- a/OpenSky.Agent/Views/Models/SettingsViewModel.cs
+++ b/OpenSky.Agent/Views/Models/SettingsViewModel.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="SettingsViewModel.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Views/Models/SoundPackTesterViewModel.cs b/OpenSky.Agent/Views/Models/SoundPackTesterViewModel.cs
index 72d05a5..fe15b24 100644
--- a/OpenSky.Agent/Views/Models/SoundPackTesterViewModel.cs
+++ b/OpenSky.Agent/Views/Models/SoundPackTesterViewModel.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="SoundPackTesterViewModel.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Views/Models/StartupViewModel.cs b/OpenSky.Agent/Views/Models/StartupViewModel.cs
index a0091c9..77d4f63 100644
--- a/OpenSky.Agent/Views/Models/StartupViewModel.cs
+++ b/OpenSky.Agent/Views/Models/StartupViewModel.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="StartupViewModel.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Views/Models/TrackingDebugViewModel.cs b/OpenSky.Agent/Views/Models/TrackingDebugViewModel.cs
index 5a78f7b..0dff5f0 100644
--- a/OpenSky.Agent/Views/Models/TrackingDebugViewModel.cs
+++ b/OpenSky.Agent/Views/Models/TrackingDebugViewModel.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="TrackingDebugViewModel.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Views/NewFlightNotification.xaml b/OpenSky.Agent/Views/NewFlightNotification.xaml
index b51b7c7..058ccbe 100644
--- a/OpenSky.Agent/Views/NewFlightNotification.xaml
+++ b/OpenSky.Agent/Views/NewFlightNotification.xaml
@@ -1,7 +1,7 @@
 <!-- 
 ====================================================================================================================
 <copyright file="NewFlightNotification.xaml" company="OpenSky">
-  OpenSky project 2021-2022
+  OpenSky project 2021-2023
 </copyright>
 <summary>
   New flight notification window
diff --git a/OpenSky.Agent/Views/NewFlightNotification.xaml.cs b/OpenSky.Agent/Views/NewFlightNotification.xaml.cs
index 0e9ed96..54606a7 100644
--- a/OpenSky.Agent/Views/NewFlightNotification.xaml.cs
+++ b/OpenSky.Agent/Views/NewFlightNotification.xaml.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="NewFlightNotification.xaml.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Views/Settings.xaml b/OpenSky.Agent/Views/Settings.xaml
index 1623145..cbfec8e 100644
--- a/OpenSky.Agent/Views/Settings.xaml
+++ b/OpenSky.Agent/Views/Settings.xaml
@@ -1,7 +1,7 @@
 <!-- 
 ====================================================================================================================
 <copyright file="Settings.xaml" company="OpenSky">
-  OpenSky project 2021-2022
+  OpenSky project 2021-2023
 </copyright>
 <summary>
   Settings window
diff --git a/OpenSky.Agent/Views/Settings.xaml.cs b/OpenSky.Agent/Views/Settings.xaml.cs
index af54ab9..1734b4e 100644
--- a/OpenSky.Agent/Views/Settings.xaml.cs
+++ b/OpenSky.Agent/Views/Settings.xaml.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="Settings.xaml.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Views/SoundPackTester.xaml b/OpenSky.Agent/Views/SoundPackTester.xaml
index 40e25e4..9572a12 100644
--- a/OpenSky.Agent/Views/SoundPackTester.xaml
+++ b/OpenSky.Agent/Views/SoundPackTester.xaml
@@ -1,7 +1,7 @@
 <!-- 
 ====================================================================================================================
 <copyright file="SoundPackTester.xaml" company="OpenSky">
-  OpenSky project 2021-2022
+  OpenSky project 2021-2023
 </copyright>
 <summary>
   Sound packer tester window
diff --git a/OpenSky.Agent/Views/SoundPackTester.xaml.cs b/OpenSky.Agent/Views/SoundPackTester.xaml.cs
index f046aea..6b91a48 100644
--- a/OpenSky.Agent/Views/SoundPackTester.xaml.cs
+++ b/OpenSky.Agent/Views/SoundPackTester.xaml.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="SoundPackTester.xaml.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Views/Startup.xaml b/OpenSky.Agent/Views/Startup.xaml
index 71759ee..53bc8c4 100644
--- a/OpenSky.Agent/Views/Startup.xaml
+++ b/OpenSky.Agent/Views/Startup.xaml
@@ -1,7 +1,7 @@
 <!-- 
 ====================================================================================================================
 <copyright file="Startup.xaml" company="OpenSky">
-  OpenSky project 2021-2022
+  OpenSky project 2021-2023
 </copyright>
 <summary>
   Startup window
diff --git a/OpenSky.Agent/Views/Startup.xaml.cs b/OpenSky.Agent/Views/Startup.xaml.cs
index 0bc7dfd..cce6a5b 100644
--- a/OpenSky.Agent/Views/Startup.xaml.cs
+++ b/OpenSky.Agent/Views/Startup.xaml.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="Startup.xaml.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/OpenSky.Agent/Views/TrackingDebug.xaml b/OpenSky.Agent/Views/TrackingDebug.xaml
index c5a732e..832e903 100644
--- a/OpenSky.Agent/Views/TrackingDebug.xaml
+++ b/OpenSky.Agent/Views/TrackingDebug.xaml
@@ -1,7 +1,7 @@
 <!-- 
 ====================================================================================================================
 <copyright file="TrackingDebug.xaml" company="OpenSky">
-  OpenSky project 2021-2022
+  OpenSky project 2021-2023
 </copyright>
 <summary>
   Tracking debug window
diff --git a/OpenSky.Agent/Views/TrackingDebug.xaml.cs b/OpenSky.Agent/Views/TrackingDebug.xaml.cs
index addba6f..93b8035 100644
--- a/OpenSky.Agent/Views/TrackingDebug.xaml.cs
+++ b/OpenSky.Agent/Views/TrackingDebug.xaml.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="TrackingDebug.xaml.cs" company="OpenSky">
-// OpenSky project 2021-2022
+// OpenSky project 2021-2023
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/changelog.txt b/changelog.txt
index 6de2736..19b7cf7 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,7 +1,20 @@
 ======================================================================================
-OpenSky Agent for MSFS Changelog
+OpenSky Flight Tracking Agent Changelog
 ======================================================================================
 
+--------------------------------------------------------------------------------------
+Version 0.5.0 (ALPHA5)
+--------------------------------------------------------------------------------------
+- Updated libraries to fix security issues and bugs
+- Added CG slider to advanced weight and balance section
+- Fixed w&b section still using simconnect instead of unified sim interface
+- New design for aircraft position arrow
+- Added update aircraft type, both for adding new updated type and added db upgrade
+  panel from client as well
+- Fixed departure range bug in flight state code
+- Added support for newly cleaned up payload station names
+- Support for actualy missing manufacturer instead of dummy one
+
 --------------------------------------------------------------------------------------
 Version 0.4.5 (ALPHA4)
 --------------------------------------------------------------------------------------