diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
index 8a27636d95e..7907c50a344 100644
--- a/.github/CHANGELOG.md
+++ b/.github/CHANGELOG.md
@@ -23,6 +23,7 @@
 1. [A380X/EWD] QoL: Add soft keys to EWD checklists, can be enabled via EFB - @flogross89 (floridude)
 1. [A380X/LIGHTS] Implemented LOGO LT switch funcionality - @ImenesFBW (Imenes)
 1. [A380X/SD] Added correct ECP ALL button SD page cycling to the A380X - @frankkopp (Frank Kopp)
+1. [A380X/SURV] Fixed BTV setup from F/O side, and ROW issues at G/A with early THR RED - @flogross89 (floridude)
 1. [A380/MFD] Limit keyboard inputs to keys present in the KCCU and remap comma to decimal dot - @beheh (Benedict Etzel)
 1. [GENERAL] Mitigated issue with pop-ups (i.e. pause on TOD notification) being unable to be dismissed while camera is in freelook + ALT-TAB - @2hwk (2cas)
 1. [A380X/AP] Improved support of simulation rate 4x - @aguther (Andreas Guther)
@@ -31,6 +32,15 @@
 1. [A380X/MFD] Fixed DIRECT TO selection of active waypoint does nothing - @sognodelx (Sven Gross)
 1. [A380X/MODEL] Optimized 4K textures - @Repsol
 1. [A380X/EFB] Moved cabin lighting from ambient light knob to EFB Quick Settings - @2hwk (2cas)
+1. [A380X/AFS] Fixed CP V/S knob push levelling off the aircraft when it should have no action - @tracernz (Mike)
+1. [A380X/MFD] MFD/SURV: Fixed TCAS not switching status when using DEFAULT SETTINGS button - @flogross89 (floridude)
+1. [A380/FUEL] Recalibrated inital fuel settings - @sschiphorst (Yahtzee94)
+1. [A380X/ENGINES] Another adjustment to taxi thrust - @donstim (donbikes)
+1. [A380/ANIM] Animation of flaps now from FPPU position. Interim fix for spoiler low end animation - @Crocket63 (crocket)
+1. [A380X/ENG] Improve oil pressure lookup table - @tracernz (Mike)
+1. [A380/WING_FLEX] Reduced stiffness of wings for more tip up bend - @Crocket63 (crocket)
+1. [A380X/FWS] Add V1 callout - @flogross89 (floridude)
+1. [FMS] Fix existing T-P moving when inserting temporary flight plan  - @Benjozork (Benjamin Dupont)
 1. [GPU] Improved handling of ground power for more immersive use @Maximilian-Reuter (\_chaoz_)
 
 ## 0.12.0
diff --git a/fbw-a32nx/src/base/flybywire-aircraft-a320-neo/html_ui/Pages/VCockpit/Instruments/Airliners/FlyByWire_A320_Neo/FMC/A32NX_FMCMainDisplay.js b/fbw-a32nx/src/base/flybywire-aircraft-a320-neo/html_ui/Pages/VCockpit/Instruments/Airliners/FlyByWire_A320_Neo/FMC/A32NX_FMCMainDisplay.js
index 432469cf1c8..06c528a647b 100644
--- a/fbw-a32nx/src/base/flybywire-aircraft-a320-neo/html_ui/Pages/VCockpit/Instruments/Airliners/FlyByWire_A320_Neo/FMC/A32NX_FMCMainDisplay.js
+++ b/fbw-a32nx/src/base/flybywire-aircraft-a320-neo/html_ui/Pages/VCockpit/Instruments/Airliners/FlyByWire_A320_Neo/FMC/A32NX_FMCMainDisplay.js
@@ -2555,11 +2555,16 @@ class FMCMainDisplay extends BaseAirliners {
     insertTemporaryFlightPlan(callback = EmptyCallback.Void) {
         if (this.flightPlanService.hasTemporary) {
             const oldCostIndex = this.costIndex;
-            const oldDestination = this.currFlightPlanService.active.destinationAirport.ident;
+            const oldDestination = this.currFlightPlanService.active.destinationAirport
+                ? this.currFlightPlanService.active.destinationAirport.ident
+                : undefined;
             const oldCruiseLevel = this.cruiseLevel;
             this.flightPlanService.temporaryInsert();
             this.checkCostIndex(oldCostIndex);
-            this.checkDestination(oldDestination);
+            // FIXME I don't know if it is actually possible to insert TMPY with no FROM/TO, but we should not crash here, so check this for now
+            if (oldDestination !== undefined) {
+                this.checkDestination(oldDestination);
+            }
             this.checkCruiseLevel(oldCruiseLevel);
 
             SimVar.SetSimVarValue("L:FMC_FLIGHT_PLAN_IS_TEMPORARY", "number", 0);
diff --git a/fbw-a32nx/src/systems/fmgc/src/flightplanning/FlightPlanService.ts b/fbw-a32nx/src/systems/fmgc/src/flightplanning/FlightPlanService.ts
index 3e573d101cb..aa950d59366 100644
--- a/fbw-a32nx/src/systems/fmgc/src/flightplanning/FlightPlanService.ts
+++ b/fbw-a32nx/src/systems/fmgc/src/flightplanning/FlightPlanService.ts
@@ -9,7 +9,7 @@ import { FlightPlanLeg, FlightPlanLegFlags } from '@fmgc/flightplanning/legs/Fli
 import { Fix, NXDataStore, Waypoint } from '@flybywiresim/fbw-sdk';
 import { NavigationDatabase } from '@fmgc/NavigationDatabase';
 import { Coordinates, Degrees } from 'msfs-geo';
-import { EventBus } from '@microsoft/msfs-sdk';
+import { BitFlags, EventBus } from '@microsoft/msfs-sdk';
 import { FixInfoEntry } from '@fmgc/flightplanning/plans/FixInfo';
 import { HoldData } from '@fmgc/flightplanning/data/flightplan';
 import { FlightPlanLegDefinition } from '@fmgc/flightplanning/legs/FlightPlanLegDefinition';
@@ -121,13 +121,36 @@ export class FlightPlanService<P extends FlightPlanPerformanceData = FlightPlanP
       temporaryPlan.alternateFlightPlan.pendingAirways.finalize();
     }
 
-    const fromLeg = temporaryPlan.maybeElementAt(temporaryPlan.activeLegIndex - 1);
+    const tmpyFromLeg = temporaryPlan.maybeElementAt(temporaryPlan.activeLegIndex - 1);
+
+    const directToInTmpy =
+      tmpyFromLeg?.isDiscontinuity === false && tmpyFromLeg.flags & FlightPlanLegFlags.DirectToTurningPoint;
+
+    const directToBeingInserted =
+      directToInTmpy && BitFlags.isAny(tmpyFromLeg.flags, FlightPlanLegFlags.PendingDirectToTurningPoint);
 
     // Update T-P
-    if (fromLeg?.isDiscontinuity === false && fromLeg.flags & FlightPlanLegFlags.DirectToTurningPoint) {
-      // TODO fm pos
-      fromLeg.definition.waypoint.location.lat = SimVar.GetSimVarValue('PLANE LATITUDE', 'Degrees');
-      fromLeg.definition.waypoint.location.long = SimVar.GetSimVarValue('PLANE LONGITUDE', 'Degrees');
+    if (directToBeingInserted) {
+      temporaryPlan.editLegFlags(
+        temporaryPlan.activeLegIndex - 1,
+        (tmpyFromLeg.flags &= ~FlightPlanLegFlags.PendingDirectToTurningPoint),
+      );
+
+      const magneticCourse: number = SimVar.GetSimVarValue('GPS GROUND MAGNETIC TRACK', 'Degrees');
+      const lat: number = SimVar.GetSimVarValue('PLANE LATITUDE', 'Degrees');
+      const long: number = SimVar.GetSimVarValue('PLANE LONGITUDE', 'Degrees');
+
+      temporaryPlan.editLegDefinition(temporaryPlan.activeLegIndex - 1, {
+        magneticCourse,
+        waypoint: {
+          ...tmpyFromLeg.definition.waypoint,
+          location: {
+            // TODO fm pos
+            lat,
+            long,
+          },
+        },
+      });
     }
 
     this.flightPlanManager.copy(FlightPlanIndex.Temporary, FlightPlanIndex.Active, CopyOptions.IncludeFixInfos);
diff --git a/fbw-a32nx/src/systems/fmgc/src/flightplanning/legs/FlightPlanLeg.ts b/fbw-a32nx/src/systems/fmgc/src/flightplanning/legs/FlightPlanLeg.ts
index 79cd16f122e..71fa552c1ca 100644
--- a/fbw-a32nx/src/systems/fmgc/src/flightplanning/legs/FlightPlanLeg.ts
+++ b/fbw-a32nx/src/systems/fmgc/src/flightplanning/legs/FlightPlanLeg.ts
@@ -22,7 +22,6 @@ import { EnrouteSegment } from '@fmgc/flightplanning/segments/EnrouteSegment';
 import { HoldData } from '@fmgc/flightplanning/data/flightplan';
 import { CruiseStepEntry } from '@fmgc/flightplanning/CruiseStep';
 import { WaypointConstraintType, AltitudeConstraint, SpeedConstraint } from '@fmgc/flightplanning/data/constraint';
-import { MagVar } from '@microsoft/msfs-sdk';
 import { HoldUtils } from '@fmgc/flightplanning/data/hold';
 import { OriginSegment } from '@fmgc/flightplanning/segments/OriginSegment';
 import { ReadonlyFlightPlanLeg } from '@fmgc/flightplanning/legs/ReadonlyFlightPlanLeg';
@@ -47,7 +46,8 @@ export interface SerializedFlightPlanLeg {
 
 export enum FlightPlanLegFlags {
   DirectToTurningPoint = 1 << 0,
-  Origin = 1 << 1,
+  PendingDirectToTurningPoint = 1 << 1,
+  Origin = 1 << 2,
 }
 
 export interface LegCalculations {
@@ -330,25 +330,6 @@ export class FlightPlanLeg implements ReadonlyFlightPlanLeg {
     );
   }
 
-  static directToTurnStart(segment: EnrouteSegment, location: Coordinates, bearing: DegreesTrue): FlightPlanLeg {
-    const magVar = MagVar.get(location.lat, location.long);
-
-    return new FlightPlanLeg(
-      segment,
-      {
-        procedureIdent: '',
-        type: LegType.FC,
-        overfly: false,
-        waypoint: WaypointFactory.fromPlaceBearingDistance('T-P', location, 0.1, bearing),
-        magneticCourse: A32NX_Util.trueToMagnetic(bearing, magVar),
-        length: 0.1,
-      },
-      '',
-      '',
-      undefined,
-    );
-  }
-
   static directToTurnEnd(segment: EnrouteSegment, waypoint: Fix): FlightPlanLeg {
     return new FlightPlanLeg(
       segment,
diff --git a/fbw-a32nx/src/systems/fmgc/src/flightplanning/plans/BaseFlightPlan.ts b/fbw-a32nx/src/systems/fmgc/src/flightplanning/plans/BaseFlightPlan.ts
index 3465049ecec..45b97230966 100644
--- a/fbw-a32nx/src/systems/fmgc/src/flightplanning/plans/BaseFlightPlan.ts
+++ b/fbw-a32nx/src/systems/fmgc/src/flightplanning/plans/BaseFlightPlan.ts
@@ -40,7 +40,7 @@ import {
   PerformanceDataFlightPlanSyncEvents,
   SyncFlightPlanEvents,
 } from '@fmgc/flightplanning/sync/FlightPlanEvents';
-import { EventBus, Publisher, Subscription } from '@microsoft/msfs-sdk';
+import { BitFlags, EventBus, Publisher, Subscription } from '@microsoft/msfs-sdk';
 import { FlightPlan } from '@fmgc/flightplanning/plans/FlightPlan';
 import { AlternateFlightPlan } from '@fmgc/flightplanning/plans/AlternateFlightPlan';
 import { FixInfoEntry } from '@fmgc/flightplanning/plans/FixInfo';
@@ -124,6 +124,24 @@ export abstract class BaseFlightPlan<P extends FlightPlanPerformanceData = Fligh
       }),
     );
 
+    this.subscriptions.push(
+      subs.on('SYNC_flightPlan.legFlagsEdit').handle((event) => {
+        if (!this.ignoreSync) {
+          if (event.planIndex !== this.index || isAlternatePlan !== event.forAlternate) {
+            return;
+          }
+
+          const element = this.legElementAt(event.atIndex);
+
+          element.flags = event.newFlags;
+
+          this.incrementVersion();
+
+          flightPlanEventsPub.pub('flightPlan.legFlagsEdit', event);
+        }
+      }),
+    );
+
     this.subscriptions.push(
       subs.on('SYNC_flightPlan.legDefinitionEdit').handle((event) => {
         if (!this.ignoreSync) {
@@ -452,6 +470,19 @@ export abstract class BaseFlightPlan<P extends FlightPlanPerformanceData = Fligh
     this.sendEvent('flightPlan.setSegmentLegs', { planIndex: this.index, forAlternate: false, segmentIndex, legs });
   }
 
+  syncLegFlagsChange(atIndex: number) {
+    const leg = this.elementAt(atIndex);
+
+    if (leg.isDiscontinuity === false) {
+      this.sendEvent('flightPlan.legFlagsEdit', {
+        planIndex: this.index,
+        atIndex,
+        forAlternate: this instanceof AlternateFlightPlan,
+        newFlags: leg.flags,
+      });
+    }
+  }
+
   syncLegDefinitionChange(atIndex: number) {
     const leg = this.elementAt(atIndex);
 
@@ -1380,6 +1411,16 @@ export abstract class BaseFlightPlan<P extends FlightPlanPerformanceData = Fligh
     this.incrementVersion();
   }
 
+  editLegFlags(index: number, flags: number, notify = true): void {
+    const leg = this.legElementAt(index);
+
+    leg.flags = flags;
+
+    if (notify) {
+      this.syncLegFlagsChange(index);
+    }
+  }
+
   editLegDefinition(index: number, changes: Partial<FlightPlanLegDefinition>, notify = true): void {
     const leg = this.legElementAt(index);
 
@@ -2295,6 +2336,7 @@ export abstract class BaseFlightPlan<P extends FlightPlanPerformanceData = Fligh
           continue;
         }
 
+        // TODO sync
         if (element.definition.type === LegType.IF && element.ident !== 'T-P') {
           element.type = LegType.TF;
         } else {
@@ -2304,7 +2346,11 @@ export abstract class BaseFlightPlan<P extends FlightPlanPerformanceData = Fligh
 
       // XX -> IF if no element, or discontinuity before, or 0th leg
       if (element && element.isDiscontinuity === false && element.type !== LegType.IF) {
-        if (!prevElement || (prevElement && prevElement.isDiscontinuity === true) || i === 0) {
+        // T-P legs need to always be CF so they can create a direct-to-fix transition outbound of them
+        const isLegTurningPoint = BitFlags.isAny(element.flags, FlightPlanLegFlags.DirectToTurningPoint);
+
+        // TODO sync
+        if (!isLegTurningPoint && (!prevElement || (prevElement && prevElement.isDiscontinuity === true) || i === 0)) {
           element.type = LegType.IF;
         }
       }
diff --git a/fbw-a32nx/src/systems/fmgc/src/flightplanning/plans/FlightPlan.ts b/fbw-a32nx/src/systems/fmgc/src/flightplanning/plans/FlightPlan.ts
index a4bd7ac8cc1..25b49d99231 100644
--- a/fbw-a32nx/src/systems/fmgc/src/flightplanning/plans/FlightPlan.ts
+++ b/fbw-a32nx/src/systems/fmgc/src/flightplanning/plans/FlightPlan.ts
@@ -19,6 +19,7 @@ import {
   FlightPlanPerformanceDataProperties,
 } from '@fmgc/flightplanning/plans/performance/FlightPlanPerformanceData';
 import { BaseFlightPlan, FlightPlanQueuedOperation, SerializedFlightPlan } from './BaseFlightPlan';
+import { FlightPlanIndex } from '@fmgc/flightplanning/FlightPlanManager';
 
 export class FlightPlan<P extends FlightPlanPerformanceData = FlightPlanPerformanceData> extends BaseFlightPlan<P> {
   static empty<P extends FlightPlanPerformanceData>(
@@ -148,6 +149,9 @@ export class FlightPlan<P extends FlightPlanPerformanceData = FlightPlanPerforma
     const turnEnd = FlightPlanLeg.directToTurnEnd(this.enrouteSegment, targetLeg.terminationWaypoint());
 
     turningPoint.flags |= FlightPlanLegFlags.DirectToTurningPoint;
+    if (this.index === FlightPlanIndex.Temporary) {
+      turningPoint.flags |= FlightPlanLegFlags.PendingDirectToTurningPoint;
+    }
     turnEnd.withDefinitionFrom(targetLeg).withPilotEnteredDataFrom(targetLeg);
     // If we don't do this, the turn end will have the termination waypoint's ident which may not be the leg ident (for runway legs for example)
     turnEnd.ident = targetLeg.ident;
@@ -186,6 +190,9 @@ export class FlightPlan<P extends FlightPlanPerformanceData = FlightPlanPerforma
     const turnEnd = FlightPlanLeg.directToTurnEnd(this.enrouteSegment, waypoint);
 
     turningPoint.flags |= FlightPlanLegFlags.DirectToTurningPoint;
+    if (this.index === FlightPlanIndex.Temporary) {
+      turningPoint.flags |= FlightPlanLegFlags.PendingDirectToTurningPoint;
+    }
 
     // Move all legs before active one to the enroute segment
     let indexInEnrouteSegment = 0;
diff --git a/fbw-a32nx/src/systems/fmgc/src/flightplanning/segments/OriginSegment.ts b/fbw-a32nx/src/systems/fmgc/src/flightplanning/segments/OriginSegment.ts
index 1ad6f60905a..d2107cfe03d 100644
--- a/fbw-a32nx/src/systems/fmgc/src/flightplanning/segments/OriginSegment.ts
+++ b/fbw-a32nx/src/systems/fmgc/src/flightplanning/segments/OriginSegment.ts
@@ -59,6 +59,7 @@ export class OriginSegment extends FlightPlanSegment {
   }
 
   private resetOriginLegFlag() {
+    // TODO this needs to be synced
     this.allLegs.forEach((leg) => {
       if (leg.isDiscontinuity === false) {
         leg.flags &= ~FlightPlanLegFlags.Origin;
diff --git a/fbw-a32nx/src/systems/fmgc/src/flightplanning/sync/FlightPlanEvents.ts b/fbw-a32nx/src/systems/fmgc/src/flightplanning/sync/FlightPlanEvents.ts
index 4f387e6c754..8036b042b7a 100644
--- a/fbw-a32nx/src/systems/fmgc/src/flightplanning/sync/FlightPlanEvents.ts
+++ b/fbw-a32nx/src/systems/fmgc/src/flightplanning/sync/FlightPlanEvents.ts
@@ -39,6 +39,11 @@ export interface FlightPlanSetSegmentLegsEvent extends FlightPlanEditSyncEvent {
   legs: (SerializedFlightPlanLeg | Discontinuity)[];
 }
 
+export interface FlightPlanLegFlagsEditEvent extends FlightPlanEditSyncEvent {
+  atIndex: number;
+  newFlags: number;
+}
+
 export interface FlightPlanLegDefinitionEditEvent extends FlightPlanEditSyncEvent {
   atIndex: number;
   newDefinition: FlightPlanLegDefinition;
@@ -81,6 +86,7 @@ export interface FlightPlanEvents {
 
   'flightPlan.setActiveLegIndex': FlightPlanSetActiveLegIndexEvent;
   'flightPlan.setSegmentLegs': FlightPlanSetSegmentLegsEvent;
+  'flightPlan.legFlagsEdit': FlightPlanLegFlagsEditEvent;
   'flightPlan.legDefinitionEdit': FlightPlanLegDefinitionEditEvent;
   'flightPlan.setLegCruiseStep': FlightPlanLegCruiseStepEditEvent;
   'flightPlan.setFixInfoEntry': FlightPlanSetFixInfoEntryEvent;
diff --git a/fbw-a380x/mach.config.js b/fbw-a380x/mach.config.js
index 0f53acc371e..1a751a10370 100644
--- a/fbw-a380x/mach.config.js
+++ b/fbw-a380x/mach.config.js
@@ -28,6 +28,7 @@ module.exports = {
     typecheckingPlugin(),
   ],
   instruments: [
+    msfsAvionicsInstrument('AtcMailbox'),
     msfsAvionicsInstrument('Clock'),
     msfsAvionicsInstrument('EWD'),
     msfsAvionicsInstrument('FCU', 'FcuBaseInstrument.ts'),
diff --git a/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/engines.cfg b/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/engines.cfg
index 4448d42e8d2..ad921691431 100644
--- a/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/engines.cfg
+++ b/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/engines.cfg
@@ -45,7 +45,7 @@ AfterBurnThrustSpecificFuelConsumption = 0.0
 mach_0_corrected_commanded_ne_table = 0:1.000000:1.201723:1.453784:2.175007:3.364756:4.472461:5.415178,0.000000:60.000000:61.058056:62.174137:64.603148:67.341070:69.189046:69.189046,0.100000:66.862170:68.041236:69.284962:71.991777:75.042834:77.102162:77.102162,0.200000:73.020528:74.308192:75.666471:78.622599:81.954674:84.203677:84.203677,0.400000:81.642229:83.081930:84.600585:87.905749:91.631250:94.145798:94.145798,0.600000:86.217009:87.737383:89.341135:92.831502:96.765760:99.421209:99.421209,0.750000:89.296188:90.870861:92.531889:96.146913:100.221680:102.971967:102.971967,0.900000:95.014663:96.690177:106.000000:102.304105:106.639817:109.566230:109.566230,1.000000:100.000000:101.763427:103.623561:107.671913:112.235116:115.315076:115.315076
 mach_hi_corrected_commanded_ne_table = 0.9:1.000000:1.201723:1.453784:2.175007:3.364756:4.472461:5.415178,0.000000:55.660639:56.642174:57.677536:59.930874:62.470783:64.185108:64.185108,0.100000:62.026518:63.120311:64.274087:66.785139:69.615535:71.525927:71.525927,0.200000:67.739487:68.934024:70.194069:72.936401:76.027492:78.113841:78.113841,0.400000:75.737643:77.073222:78.482043:81.548169:85.004232:87.336921:87.336921,0.600000:79.981563:81.391980:82.879744:86.117679:89.767400:92.230800:92.230800,0.750000:82.838047:84.298836:85.839735:89.193310:92.973379:95.524757:95.524757,0.900000:88.142947:89.697284:98.333795:94.905197:98.927339:101.642106:101.642106,1.000000:92.767731:94.403623:96.129227:99.884791:104.117971:106.975180:106.975180
 corrected_n2_from_ff_table = 0.000184:20.234723,0.017030:60.000352,0.018464:65.542906,0.108271:69.501874,0.141371:73.460841,0.168471:76.540038,0.190658:79.179350,0.208824:81.818662,0.213632:87.977056,0.269273:100.000000
-n1_and_mach_on_thrust_table=0:0:0.1:0.2:0.3:0.4:0.5:0.6:0.7:0.8:0.9,0:0:0:0:0:0:0:0:0:0:0,20:0.065:0.008:0.015:0.0337152:-0.0207408:-0.0447408:-0.0684924:-0.2470092:-0.3784788:-0.5864604,25:0.061:0.0536:0.018:0.0364848:-0.0115116:-0.0318852:-0.0503988:-0.1815936:-0.3194448:-0.5268336,30:0.16:0.16:0.020:0.0392976:0.0208668:0.004788:-0.0323052:-0.0621768:-0.0983352:-0.4432692,35:0.3146484:0.1512564:0.0926472:0.0551052:0.0296628:0.0072744:-0.0033744:-0.02736:-0.0530976:-0.3523572,40:0.396276:0.1953084:0.1489056:0.0834948:0.069486:0.0595452:0.035748:-0.0025668:-0.0309732:-0.264756,45:0.4719516:0.3001152:0.1880484:0.1349028:0.1097016:0.0921084:0.067308:0.0222108:-0.00885:-0.186144,50:0.5428044:0.3732792:0.2536236:0.1898088:0.1529148:0.125898:0.0974052:0.0569028:0.0132744:-0.1181688,55:0.6113616:0.4482816:0.3239532:0.2509272:0.20238:0.1646676:0.1300596:0.090792:0.0344448:-0.0593628,60:0.7135368:0.527946:0.4015548:0.3209724:0.2613276:0.2122788:0.1696848:0.1285776:0.0774672:-0.0060432,65:0.792042:0.6151248:0.4885812:0.402066:0.3323136:0.2720028:0.2203524:0.17502:0.1253292:0.0468144,70:0.8803212:0.7122072:0.5862852:0.4951476:0.4165956:0.345852:0.2850708:0.2341704:0.182982:0.1047228,75:0.9824316:0.820656:0.6945072:0.5994168:0.5135268:0.4339248:0.3650892:0.3086364:0.254406:0.1728504,80:1.0924128:0.940554:0.8111784:0.7117992:0.6199728:0.72061164:0.61995618:0.53846208:0.46148454:0.34453998,85:1.230198:1.0701876:0.9318576:0.8264304:0.7297536:0.8638002:0.76034862:0.6782778:0.6008094:0.47774934,90:1.3884588:1.205634:1.04928:0.9341592:0.8331012:1.00279782:0.90328122:0.82806786:0.75678138:0.63212886,95:1.5375996:1.3403916:1.1529288:1.0220796:0.916146:1.1192418:1.03216032:0.97414164:0.91949256:0.80217054,100:1.629522:1.4650128:1.2286368:1.0730808:0.9604224:1.18825056:1.12376808:1.06059942:1.00110006:0.8733663,105:1.6545912:1.4875512:1.2581976:1.0989:0.9835308:1.21684194:1.1508075:1.08611928:1.02518784:0.89437932,110:1.6713048:1.5025776:1.2831864:1.1207244:1.0030632:1.24100748:1.17366246:1.10768958:1.045548:0.91214262
+n1_and_mach_on_thrust_table=0:0:0.1:0.2:0.3:0.4:0.5:0.6:0.7:0.8:0.9,0:0.015:-0.15:0:0:0:0:0:0:0:0,20:0.1286:-0.008:0.015:0.0337152:-0.0207408:-0.0447408:-0.0684924:-0.2470092:-0.3784788:-0.5864604,25:0.155:0.0236:0.018:0.0364848:-0.0115116:-0.0318852:-0.0503988:-0.1815936:-0.3194448:-0.5268336,30:0.16:0.16:0.020:0.0392976:0.0208668:0.004788:-0.0323052:-0.0621768:-0.0983352:-0.4432692,35:0.3146484:0.1512564:0.0926472:0.0551052:0.0296628:0.0072744:-0.0033744:-0.02736:-0.0530976:-0.3523572,40:0.396276:0.1953084:0.1489056:0.0834948:0.069486:0.0595452:0.035748:-0.0025668:-0.0309732:-0.264756,45:0.4719516:0.3001152:0.1880484:0.1349028:0.1097016:0.0921084:0.067308:0.0222108:-0.00885:-0.186144,50:0.5428044:0.3732792:0.2536236:0.1898088:0.1529148:0.125898:0.0974052:0.0569028:0.0132744:-0.1181688,55:0.6113616:0.4482816:0.3239532:0.2509272:0.20238:0.1646676:0.1300596:0.090792:0.0344448:-0.0593628,60:0.7135368:0.527946:0.4015548:0.3209724:0.2613276:0.2122788:0.1696848:0.1285776:0.0774672:-0.0060432,65:0.792042:0.6151248:0.4885812:0.402066:0.3323136:0.2720028:0.2203524:0.17502:0.1253292:0.0468144,70:0.8803212:0.7122072:0.5862852:0.4951476:0.4165956:0.345852:0.2850708:0.2341704:0.182982:0.1047228,75:0.9824316:0.820656:0.6945072:0.5994168:0.5135268:0.4339248:0.3650892:0.3086364:0.254406:0.1728504,80:1.0924128:0.940554:0.8111784:0.7117992:0.6199728:0.72061164:0.61995618:0.53846208:0.46148454:0.34453998,85:1.230198:1.0701876:0.9318576:0.8264304:0.7297536:0.8638002:0.76034862:0.6782778:0.6008094:0.47774934,90:1.3884588:1.205634:1.04928:0.9341592:0.8331012:1.00279782:0.90328122:0.82806786:0.75678138:0.63212886,95:1.5375996:1.3403916:1.1529288:1.0220796:0.916146:1.1192418:1.03216032:0.97414164:0.91949256:0.80217054,100:1.629522:1.4650128:1.2286368:1.0730808:0.9604224:1.18825056:1.12376808:1.06059942:1.00110006:0.8733663,105:1.6545912:1.4875512:1.2581976:1.0989:0.9835308:1.21684194:1.1508075:1.08611928:1.02518784:0.89437932,110:1.6713048:1.5025776:1.2831864:1.1207244:1.0030632:1.24100748:1.17366246:1.10768958:1.045548:0.91214262
 n2_to_n1_table = 0:0:0.2:0.9,16.01173:0:0:17,19.354839:1.62525110132159:1.62525110132159:17.34466,22.8739:2.13848810572687:2.13848810572687:18.127184,50.146628:10.9490607929515:10.9490607929515:26.627184,60:16.2995594713656:16.2995594713656:33.727774,67.741935:22.2402801762115:22.2402801762115:40.08227,73.020528:26.8767286343612:26.8767286343612:43.853613,78.29912:35.0472960352423:35.0472960352423:48.89878,81.642229:43.6251656387665:43.6251656387665:53.556563,85.337243:63.106796:63.106796:63.106796,87.97654:74.757282:74.757282:74.757282,97.8:97.2:97.2:97.2,118:115.346535:115.346535:115.346535
 corrected_airflow_table = 0.000000:0.000000:0.100000:0.200000:0.300000:0.400000:0.500000:0.600000:0.700000:0.800000:0.900000,0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000,20.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000,25.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000,30.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000,35.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000,40.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000,45.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000,50.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000,55.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000,60.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000,65.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000,70.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000,75.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000,80.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000,85.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000,90.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000,95.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000,100.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000,105.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000,110.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000:0.000000
 epr_max = 1.4
@@ -55,9 +55,10 @@ oil_temp_cooling_constant = 0.21
 oil_temp_heating_constant = 700
 oil_temp_tc = 0.03
 oil_temp_tuning_constant = 1
-oil_press_max = 60480
+oil_press_max = 21456 ; ~149 psi
 oil_press_tc = 0.8
 oil_press_tuning_constant = 1
+n1_to_oil_pressure_table = 0:0,0.01:0,0.1095:0.403,0.269:0.604,1.154:1 ; % of max Oil Pressure for % N1.
 itt_peak_temperature = 2250
 itt_tc = 2
 itt_tuning_constant = 1
@@ -83,7 +84,6 @@ min_n2_for_starter_cutoff = 200 ; % - Minimum N2 at which the starter is automat
 min_n2_for_apu_bleed_air_cutoff = 200 ; % - Minimum N2 at which the APU Bleed Air is automatically disabled
 n2_from_bleed_air_psi_table = 0:0, 4:8, 10:18, 18:25 ; Table which contains the n2 generated depending on the pression from the bleed air from the APU (in psi).
 bleed_air_on_n2_tc = 1 ; Time constant which contains the speed at which the bleed air pressure affect the N2 of the turbine.
-N1_to_oil_pressure_table = 0:0, 0.21:0.71, 0.9:0.989, 1:1 ; % of max Oil Pressure for % N1.
 ;fuel_flow_max_itt_factor = 2.0
 ;fuel_flow_min_itt_factor = 0.9
 n1_cooling_factor = 0.01
diff --git a/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/A380_EXTERIOR.xml b/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/A380_EXTERIOR.xml
index d829d54c9be..199ee21448c 100755
--- a/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/A380_EXTERIOR.xml
+++ b/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/A380_EXTERIOR.xml
@@ -309,49 +309,49 @@
                 <!-- 1L -->
                 <UseTemplate Name="FBW_Spoiler_Surface_Template">
                     <ANIM_NAME>l_spoiler1_key</ANIM_NAME>
-                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_1_LEFT_DEFLECTION, number)</DEFLECTION_CODE>
+                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_1_LEFT_DEFLECTION_UNSMOOTH, number)</DEFLECTION_CODE>
                 </UseTemplate>
 
                 <!-- 2L -->
                 <UseTemplate Name="FBW_Spoiler_Surface_Template">
                     <ANIM_NAME>l_spoiler2_key</ANIM_NAME>
-                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_2_LEFT_DEFLECTION, number)</DEFLECTION_CODE>
+                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_2_LEFT_DEFLECTION_UNSMOOTH, number)</DEFLECTION_CODE>
                 </UseTemplate>
 
                 <!-- 3L -->
                 <UseTemplate Name="FBW_Spoiler_Surface_Template">
                     <ANIM_NAME>l_spoiler3_key</ANIM_NAME>
-                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_3_LEFT_DEFLECTION, number)</DEFLECTION_CODE>
+                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_3_LEFT_DEFLECTION_UNSMOOTH, number)</DEFLECTION_CODE>
                 </UseTemplate>
 
                 <!-- 4L -->
                 <UseTemplate Name="FBW_Spoiler_Surface_Template">
                     <ANIM_NAME>l_spoiler4_key</ANIM_NAME>
-                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_4_LEFT_DEFLECTION, number)</DEFLECTION_CODE>
+                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_4_LEFT_DEFLECTION_UNSMOOTH, number)</DEFLECTION_CODE>
                 </UseTemplate>
 
                 <!-- 5L -->
                 <UseTemplate Name="FBW_Spoiler_Surface_Template">
                     <ANIM_NAME>l_spoiler5_key</ANIM_NAME>
-                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_5_LEFT_DEFLECTION, number)</DEFLECTION_CODE>
+                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_5_LEFT_DEFLECTION_UNSMOOTH, number)</DEFLECTION_CODE>
                 </UseTemplate>
 
                 <!-- 6L -->
                 <UseTemplate Name="FBW_Spoiler_Surface_Template">
                     <ANIM_NAME>l_spoiler6_key</ANIM_NAME>
-                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_6_LEFT_DEFLECTION, number)</DEFLECTION_CODE>
+                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_6_LEFT_DEFLECTION_UNSMOOTH, number)</DEFLECTION_CODE>
                 </UseTemplate>
 
                 <!-- 7L -->
                 <UseTemplate Name="FBW_Spoiler_Surface_Template">
                     <ANIM_NAME>l_spoiler7_key</ANIM_NAME>
-                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_7_LEFT_DEFLECTION, number)</DEFLECTION_CODE>
+                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_7_LEFT_DEFLECTION_UNSMOOTH, number)</DEFLECTION_CODE>
                 </UseTemplate>
 
                 <!-- 8L -->
                 <UseTemplate Name="FBW_Spoiler_Surface_Template">
                     <ANIM_NAME>l_spoiler8_key</ANIM_NAME>
-                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_8_LEFT_DEFLECTION, number)</DEFLECTION_CODE>
+                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_8_LEFT_DEFLECTION_UNSMOOTH, number)</DEFLECTION_CODE>
                 </UseTemplate>
             </Component>
 
@@ -360,49 +360,49 @@
                 <!-- 1R -->
                 <UseTemplate Name="FBW_Spoiler_Surface_Template">
                     <ANIM_NAME>r_spoiler1_key</ANIM_NAME>
-                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_1_RIGHT_DEFLECTION, number)</DEFLECTION_CODE>
+                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_1_RIGHT_DEFLECTION_UNSMOOTH, number)</DEFLECTION_CODE>
                 </UseTemplate>
 
                 <!-- 2R -->
                 <UseTemplate Name="FBW_Spoiler_Surface_Template">
                     <ANIM_NAME>r_spoiler2_key</ANIM_NAME>
-                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_2_RIGHT_DEFLECTION, number)</DEFLECTION_CODE>
+                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_2_RIGHT_DEFLECTION_UNSMOOTH, number)</DEFLECTION_CODE>
                 </UseTemplate>
 
                 <!-- 3R -->
                 <UseTemplate Name="FBW_Spoiler_Surface_Template">
                     <ANIM_NAME>r_spoiler3_key</ANIM_NAME>
-                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_3_RIGHT_DEFLECTION, number)</DEFLECTION_CODE>
+                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_3_RIGHT_DEFLECTION_UNSMOOTH, number)</DEFLECTION_CODE>
                 </UseTemplate>
 
                 <!-- 4R -->
                 <UseTemplate Name="FBW_Spoiler_Surface_Template">
                     <ANIM_NAME>r_spoiler4_key</ANIM_NAME>
-                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_4_RIGHT_DEFLECTION, number)</DEFLECTION_CODE>
+                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_4_RIGHT_DEFLECTION_UNSMOOTH, number)</DEFLECTION_CODE>
                 </UseTemplate>
 
                 <!-- 5R -->
                 <UseTemplate Name="FBW_Spoiler_Surface_Template">
                     <ANIM_NAME>r_spoiler5_key</ANIM_NAME>
-                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_5_RIGHT_DEFLECTION, number)</DEFLECTION_CODE>
+                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_5_RIGHT_DEFLECTION_UNSMOOTH, number)</DEFLECTION_CODE>
                 </UseTemplate>
 
                 <!-- 6R -->
                 <UseTemplate Name="FBW_Spoiler_Surface_Template">
                     <ANIM_NAME>r_spoiler6_key</ANIM_NAME>
-                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_6_RIGHT_DEFLECTION, number)</DEFLECTION_CODE>
+                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_6_RIGHT_DEFLECTION_UNSMOOTH, number)</DEFLECTION_CODE>
                 </UseTemplate>
 
                 <!-- 7R -->
                 <UseTemplate Name="FBW_Spoiler_Surface_Template">
                     <ANIM_NAME>r_spoiler7_key</ANIM_NAME>
-                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_7_RIGHT_DEFLECTION, number)</DEFLECTION_CODE>
+                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_7_RIGHT_DEFLECTION_UNSMOOTH, number)</DEFLECTION_CODE>
                 </UseTemplate>
 
                 <!-- 8R -->
                 <UseTemplate Name="FBW_Spoiler_Surface_Template">
                     <ANIM_NAME>r_spoiler8_key</ANIM_NAME>
-                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_8_RIGHT_DEFLECTION, number)</DEFLECTION_CODE>
+                    <DEFLECTION_CODE>(L:A32NX_HYD_SPOILER_8_RIGHT_DEFLECTION_UNSMOOTH, number)</DEFLECTION_CODE>
                 </UseTemplate>
             </Component>
 
@@ -449,26 +449,17 @@
             </Component>
 
             <!-- Flaps -->
-            <UseTemplate Name="ASOBO_HANDLING_Flaps_Template">
-                <ANIM_NAME_LEFT>l_flap_percent_key</ANIM_NAME_LEFT>
-                <ANIM_NAME_RIGHT>r_flap_percent_key</ANIM_NAME_RIGHT>
-                <!-- ANIM_EVENTS -->
-                <ANIM_EVENT_EFFECT_NAME_1>CAM_FLAPS01</ANIM_EVENT_EFFECT_NAME_1>
-                <NORMALIZED_TIME_1>0.01</NORMALIZED_TIME_1>
-                <DIRECTION_1>Both</DIRECTION_1>
-                <ANIM_EVENT_EFFECT_NAME_2>CAM_FLAPS02</ANIM_EVENT_EFFECT_NAME_2>
-                <NORMALIZED_TIME_2>0.15</NORMALIZED_TIME_2>
-                <DIRECTION_2>Both</DIRECTION_2>
-                <ANIM_EVENT_EFFECT_NAME_3>CAM_FLAPS03</ANIM_EVENT_EFFECT_NAME_3>
-                <NORMALIZED_TIME_3>0.29</NORMALIZED_TIME_3>
-                <DIRECTION_3>Both</DIRECTION_3>
-                <ANIM_EVENT_EFFECT_NAME_4>CAM_FLAPS04</ANIM_EVENT_EFFECT_NAME_4>
-                <NORMALIZED_TIME_4>0.43</NORMALIZED_TIME_4>
-                <DIRECTION_4>Both</DIRECTION_4>
-                <ANIM_EVENT_EFFECT_NAME_5>CAM_FLAPS05</ANIM_EVENT_EFFECT_NAME_5>
-                <NORMALIZED_TIME_5>0.58</NORMALIZED_TIME_5>
-                <DIRECTION_5>Both</DIRECTION_5>
+            <UseTemplate Name="ASOBO_GT_Anim">
+                <ANIM_NAME>l_flap_percent_key</ANIM_NAME>
+                <ANIM_CODE>(L:A32NX_LEFT_FLAPS_ANIMATION_POSITION)</ANIM_CODE>
+                <ANIM_LENGTH>100</ANIM_LENGTH>
             </UseTemplate>
+
+	        <UseTemplate Name="ASOBO_GT_Anim">
+                <ANIM_NAME>r_flap_percent_key</ANIM_NAME>
+                <ANIM_CODE>(L:A32NX_RIGHT_FLAPS_ANIMATION_POSITION)</ANIM_CODE>
+                <ANIM_LENGTH>100</ANIM_LENGTH>
+	    	</UseTemplate>
         </Component>
 
         <Component ID="DOOR_ANIMATIONS_EXTERIOR">
diff --git a/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/legacy/generated/A32NX_Interior_FCU.xml b/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/legacy/generated/A32NX_Interior_FCU.xml
index d964817466c..f570d6abe16 100644
--- a/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/legacy/generated/A32NX_Interior_FCU.xml
+++ b/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/legacy/generated/A32NX_Interior_FCU.xml
@@ -238,20 +238,11 @@
     </Template>
 
     <Template Name="FBW_Airbus_Autopilot_Knob_VerticalSpeed_Template">
-        <DefaultTemplateParameters>
+        <Parameters Type="Default">
             <ID>1</ID>
-        </DefaultTemplateParameters>
-
-        <UseTemplate Name="ASOBO_GT_Helper_Suffix_ID_Appender">
-            <TEMPLATE_TO_CALL>FBW_Airbus_Autopilot_Knob_VerticalSpeed_SubTemplate</TEMPLATE_TO_CALL>
-        </UseTemplate>
-    </Template>
-
-    <Template Name="FBW_Airbus_Autopilot_Knob_VerticalSpeed_SubTemplate">
-        <DefaultTemplateParameters>
-            <NODE_ID>AUTOPILOT_Knob_VerticalSpeed#SUFFIX_ID#</NODE_ID>
-            <ANIM_NAME>AUTOPILOT_Knob_VerticalSpeed#SUFFIX_ID#</ANIM_NAME>
-            <ANIM_NAME_PUSHPULL>AUTOPILOT_Knob_VerticalSpeed_PushPull#SUFFIX_ID#</ANIM_NAME_PUSHPULL>
+            <NODE_ID>AUTOPILOT_Knob_VerticalSpeed</NODE_ID>
+            <ANIM_NAME>AUTOPILOT_Knob_VerticalSpeed</ANIM_NAME>
+            <ANIM_NAME_PUSHPULL>AUTOPILOT_Knob_VerticalSpeed_PushPull</ANIM_NAME_PUSHPULL>
             <PART_ID>AUTOPILOT_Knob_VerticalSpeed</PART_ID>
             <WWISE_EVENT>QNHknob</WWISE_EVENT>
             <COUNT>36</COUNT>
@@ -265,13 +256,7 @@
             <ANIMTIP_1_ON_CURSOR>TurnRight</ANIMTIP_1_ON_CURSOR>
             <ANIMTIP_3>%((L:A32NX_TRK_FPA_MODE_ACTIVE, bool))%{if}Engage flight path angle%{else}Engage vertical speed%{end}</ANIMTIP_3>
             <ANIMTIP_3_ON_CURSOR>DownArrow</ANIMTIP_3_ON_CURSOR>
-        </DefaultTemplateParameters>
-        <EditableTemplateParameters>
-            <AddParams>
-                <ANIM_NAME/>
-                <ANIM_NAME_PUSHPULL/>
-            </AddParams>
-        </EditableTemplateParameters>
+        </Parameters>
 
         <Component ID="#NODE_ID#" Node="#NODE_ID#">
             <UseTemplate Name="ASOBO_GT_Knob_Infinite_PushPull">
@@ -295,10 +280,7 @@
                     (&gt;H:A320_Neo_FCU_VS_PULL)
                     (&gt;H:A320_Neo_CDU_VS)
                 </PULL_CODE>
-                <PUSH_CODE>
-                    (&gt;H:A320_Neo_FCU_VS_PUSH)
-                    (&gt;H:A320_Neo_CDU_VS)
-                </PUSH_CODE>
+                <PUSH_CODE/>
                 <CENTER_RADIUS>0</CENTER_RADIUS>
                 <WWISE_EVENT_1>QNHknob</WWISE_EVENT_1>
                 <WWISE_EVENT_2>QNHknob</WWISE_EVENT_2>
diff --git a/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/panel.cfg b/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/panel.cfg
index bf497acb6f7..60212725b7b 100644
--- a/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/panel.cfg
+++ b/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/panel.cfg
@@ -46,6 +46,7 @@ pixel_size=768,1024
 texture=$SCREEN_DU_SD
 
 htmlgauge00=A380X/SD/sd.html?duID=7, 0,0,768,1024
+htmlgauge01=A380X/AtcMailbox/atcmailbox.html?duID=7, 0,0,768,1024
 
 [VCockpit05]
 size_mm=768,1024
diff --git a/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/sound/sound.xml b/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/sound/sound.xml
index a44ab12a513..97a7214fa9c 100644
--- a/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/sound/sound.xml
+++ b/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/sound/sound.xml
@@ -1177,6 +1177,14 @@
             </Requires>
         </Sound>
 
+        <!-- V1 callout ===================================================================== -->
+        <Sound WwiseEvent="V1" WwiseData="true" NodeName="Wiper_Base_l" LocalVar="A32NX_AUDIO_V1_CALLOUT" Continuous="false">
+            <Range LowerBound="1"/>
+            <Requires SimVar="ELECTRICAL MAIN BUS VOLTAGE" Units="VOLTS" Index="1">
+                <Range LowerBound="28" />
+            </Requires>
+        </Sound>
+
     </SimVarSounds>
 
     <!-- AvionicSounds ========================================================================================== -->
@@ -1216,7 +1224,6 @@
         <Sound WwiseData="true" WwiseEvent="aural_1000ft" />
         <Sound WwiseData="true" WwiseEvent="aural_2500ft" />
         <Sound WwiseData="true" WwiseEvent="aural_retard" />
-        <Sound WwiseData="true" WwiseEvent="aural_v1" />
         <Sound WwiseEvent="cavcharge" WwiseData="true" NodeName="PEDALS_LEFT" Continuous="false" />
         <Sound WwiseEvent="3click" WwiseData="true" NodeName="PEDALS_LEFT" Continuous="false" />
         <Sound WwiseData="true" WwiseEvent="fwdgalley" NodeName="WIPER_BASE_L" />
diff --git a/fbw-a380x/src/systems/instruments/src/AtcMailbox/.eslintrc.js b/fbw-a380x/src/systems/instruments/src/AtcMailbox/.eslintrc.js
new file mode 100644
index 00000000000..5001200a0c2
--- /dev/null
+++ b/fbw-a380x/src/systems/instruments/src/AtcMailbox/.eslintrc.js
@@ -0,0 +1,15 @@
+'use strict';
+
+module.exports = {
+  extends: ['../../../../../../.eslintrc.js', 'plugin:jsdoc/recommended-typescript-error'],
+
+  plugins: ['eslint-plugin-jsdoc'],
+
+  // overrides airbnb, use sparingly
+  rules: {
+    'react/no-unknown-property': 'off',
+    'react/style-prop-object': 'off',
+    'arrow-body-style': 'off',
+    camelcase: 'off',
+  },
+};
diff --git a/fbw-a380x/src/systems/instruments/src/AtcMailbox/AtcMailbox.tsx b/fbw-a380x/src/systems/instruments/src/AtcMailbox/AtcMailbox.tsx
new file mode 100644
index 00000000000..01f0a8b12e2
--- /dev/null
+++ b/fbw-a380x/src/systems/instruments/src/AtcMailbox/AtcMailbox.tsx
@@ -0,0 +1,61 @@
+//  Copyright (c) 2024 FlyByWire Simulations
+//  SPDX-License-Identifier: GPL-3.0
+
+import { DisplayComponent, EventBus, FSComponent, Subject, VNode } from '@microsoft/msfs-sdk';
+import { Button } from 'instruments/src/MFD/pages/common/Button';
+import { MouseCursor } from 'instruments/src/MFD/pages/common/MouseCursor';
+import { CdsDisplayUnit, DisplayUnitID } from '../MsfsAvionicsCommon/CdsDisplayUnit';
+
+import './style.scss';
+
+export interface AtcMailboxProps {
+  readonly bus: EventBus;
+}
+
+export class AtcMailbox extends DisplayComponent<AtcMailboxProps> {
+  private readonly topRef = FSComponent.createRef<HTMLDivElement>();
+
+  private readonly mouseCursorRef = FSComponent.createRef<MouseCursor>();
+
+  private onMouseMove(ev: MouseEvent) {
+    this.mouseCursorRef.getOrDefault()?.updatePosition(ev.clientX, ev.clientY - 768);
+  }
+
+  private onMouseMoveHandler = this.onMouseMove.bind(this);
+
+  public onAfterRender(node: VNode): void {
+    super.onAfterRender(node);
+
+    this.topRef.instance.addEventListener('mousemove', this.onMouseMoveHandler);
+  }
+
+  destroy(): void {
+    this.topRef.getOrDefault()?.removeEventListener('mousemove', this.onMouseMoveHandler);
+
+    super.destroy();
+  }
+
+  render(): VNode | null {
+    return (
+      <CdsDisplayUnit bus={this.props.bus} displayUnitId={DisplayUnitID.Sd}>
+        <div ref={this.topRef} class="atc-mailbox-top-layout">
+          <div class="atc-mailbox-left-layout">
+            <Button label="RECALL" onClick={() => {}} buttonStyle="height: 50px;"></Button>
+          </div>
+          <div class="atc-mailbox-center-layout">
+            <div class="atc-mailbox-center-top"></div>
+            <div class="atc-mailbox-center-bottom">
+              <div class="atc-mailbox-cb-1" />
+              <div class="atc-mailbox-cb-2" />
+            </div>
+          </div>
+          <div class="atc-mailbox-right-layout">
+            <Button label="CLOSE" onClick={() => {}} buttonStyle="height: 50px; justify-content: flex-end;"></Button>
+            <Button label="PRINT" onClick={() => {}} buttonStyle="height: 50px; justify-content: flex-end;"></Button>
+          </div>
+          <MouseCursor side={Subject.create('CAPT')} ref={this.mouseCursorRef} />
+        </div>
+      </CdsDisplayUnit>
+    );
+  }
+}
diff --git a/fbw-a380x/src/systems/instruments/src/AtcMailbox/config.json b/fbw-a380x/src/systems/instruments/src/AtcMailbox/config.json
new file mode 100644
index 00000000000..16331a90ebb
--- /dev/null
+++ b/fbw-a380x/src/systems/instruments/src/AtcMailbox/config.json
@@ -0,0 +1,5 @@
+{
+  "index": "./instrument.tsx",
+  "name": "AtcMailbox",
+  "isInteractive": true
+}
diff --git a/fbw-a380x/src/systems/instruments/src/AtcMailbox/instrument.tsx b/fbw-a380x/src/systems/instruments/src/AtcMailbox/instrument.tsx
new file mode 100644
index 00000000000..21404330143
--- /dev/null
+++ b/fbw-a380x/src/systems/instruments/src/AtcMailbox/instrument.tsx
@@ -0,0 +1,105 @@
+import {
+  FSComponent,
+  EventBus,
+  HEventPublisher,
+  InstrumentBackplane,
+  FsInstrument,
+  FsBaseInstrument,
+  ClockPublisher,
+} from '@microsoft/msfs-sdk';
+import { FailuresConsumer } from '@flybywiresim/fbw-sdk';
+import { AtcMailbox } from 'instruments/src/AtcMailbox/AtcMailbox';
+
+class AtcMailboxInstrument implements FsInstrument {
+  private readonly bus = new EventBus();
+
+  private readonly backplane = new InstrumentBackplane();
+
+  private readonly clockPublisher = new ClockPublisher(this.bus);
+
+  private readonly hEventPublisher = new HEventPublisher(this.bus);
+
+  private readonly failuresConsumer = new FailuresConsumer('A32NX');
+
+  constructor(public readonly instrument: BaseInstrument) {
+    this.hEventPublisher = new HEventPublisher(this.bus);
+
+    this.backplane.addPublisher('hEvent', this.hEventPublisher);
+    this.backplane.addPublisher('clock', this.clockPublisher);
+
+    this.doInit();
+  }
+
+  public doInit(): void {
+    this.backplane.init();
+
+    const atcMailbox = document.getElementById('AtcMailbox_CONTENT');
+
+    FSComponent.render(<AtcMailbox bus={this.bus} />, document.getElementById('AtcMailbox_CONTENT'));
+
+    // Remove "instrument didn't load" text
+    atcMailbox?.querySelector(':scope > h1')?.remove();
+  }
+
+  /**
+   * A callback called when the instrument gets a frame update.
+   */
+  public Update(): void {
+    this.backplane.onUpdate();
+    this.failuresConsumer.update();
+  }
+
+  public onInteractionEvent(args: string[]): void {
+    this.hEventPublisher.dispatchHEvent(args[0]);
+  }
+
+  public onGameStateChanged(_oldState: GameState, _newState: GameState): void {
+    // noop
+  }
+
+  public onFlightStart(): void {
+    // noop
+  }
+
+  public onSoundEnd(_soundEventId: Name_Z): void {
+    // noop
+  }
+
+  public onPowerOn(): void {
+    // noop
+  }
+
+  public onPowerOff(): void {
+    // noop
+  }
+}
+
+class A380X_AtcMailbox extends FsBaseInstrument<AtcMailboxInstrument> {
+  public constructInstrument(): AtcMailboxInstrument {
+    return new AtcMailboxInstrument(this);
+  }
+
+  public get isInteractive(): boolean {
+    return true;
+  }
+
+  public get templateID(): string {
+    return 'A380X_AtcMailbox';
+  }
+
+  /** @inheritdoc */
+  public onPowerOn(): void {
+    super.onPowerOn();
+
+    this.fsInstrument.onPowerOn();
+  }
+
+  /** @inheritdoc */
+  public onShutDown(): void {
+    super.onShutDown();
+
+    this.fsInstrument.onPowerOff();
+  }
+}
+
+registerInstrument('a380x-atc-mailbox', A380X_AtcMailbox);
diff --git a/fbw-a380x/src/systems/instruments/src/AtcMailbox/style.scss b/fbw-a380x/src/systems/instruments/src/AtcMailbox/style.scss
new file mode 100644
index 00000000000..d2d156b4c68
--- /dev/null
+++ b/fbw-a380x/src/systems/instruments/src/AtcMailbox/style.scss
@@ -0,0 +1,54 @@
+// Copyright (c) 2024 FlyByWire Simulations
+// SPDX-License-Identifier: GPL-3.0
+
+@import "../MsfsAvionicsCommon/definitions.scss";
+
+.atc-mailbox-top-layout {
+  display: grid;
+  grid-template-columns: 13% auto 18%;
+  height: 256px;
+  width: 768px;
+  position: absolute;
+  top: 768px;
+}
+
+.atc-mailbox-left-layout {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-end;
+  border-right: 2px solid $display-white;
+}
+
+.atc-mailbox-center-layout {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-end;
+}
+
+.atc-mailbox-right-layout {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  border-left: 2px solid $display-white;
+}
+
+.atc-mailbox-center-bottom {
+  display: flex;
+  flex: 1;
+  flex-direction: row;
+}
+
+.atc-mailbox-center-top {
+  display: flex;
+  flex: 8;
+  border-bottom: 2px solid white;
+}
+
+.atc-mailbox-cb-1 {
+  flex: 1;
+  border-right: 2px solid white;
+}
+
+.atc-mailbox-cb-2 {
+  flex: 1;
+}
diff --git a/fbw-a380x/src/systems/instruments/src/AtcMailbox/tsconfig.json b/fbw-a380x/src/systems/instruments/src/AtcMailbox/tsconfig.json
new file mode 100644
index 00000000000..b051de3a024
--- /dev/null
+++ b/fbw-a380x/src/systems/instruments/src/AtcMailbox/tsconfig.json
@@ -0,0 +1,33 @@
+{
+  "extends": "../../../tsconfig.json",
+
+  "compilerOptions": {
+    "incremental": false /* Enables incremental builds */,
+    "target": "es2017" /* Specifies the ES2017 target, compatible with Coherent GT */,
+    "module": "es2015" /* Ensures that modules are at least es2015 */,
+    "strict": true /* Enables strict type checking, highly recommended but optional */,
+    "esModuleInterop": true /* Emits additional JS to work with CommonJS modules */,
+    "skipLibCheck": true /* Skip type checking on library .d.ts files */,
+    "forceConsistentCasingInFileNames": true /* Ensures correct import casing */,
+    "moduleResolution": "node" /* Enables compatibility with MSFS SDK bare global imports */,
+    "jsxFactory": "FSComponent.buildComponent" /* Required for FSComponent framework JSX */,
+    "jsxFragmentFactory": "FSComponent.Fragment" /* Required for FSComponent framework JSX */,
+    "jsx": "react", /* Required for FSComponent framework JSX */
+    "paths": {
+      "@datalink/aoc": ["../../../fbw-common/src/systems/datalink/aoc/src/index.ts"],
+      "@datalink/atc": ["../../../fbw-common/src/systems/datalink/atc/src/index.ts"],
+      "@datalink/common": ["../../../fbw-common/src/systems/datalink/common/src/index.ts"],
+      "@datalink/router": ["../../../fbw-common/src/systems/datalink/router/src/index.ts"],
+      "@failures": ["./failures/src/index.ts"],
+      "@fmgc/*": ["./fmgc/src/*"],
+      "@instruments/common/*": ["./instruments/src/Common/*"],
+      "@localization/*": ["../localization/*"],
+      "@sentry/*": ["./sentry-client/src/*"],
+      "@simbridge/*": ["./simbridge-client/src/*"],
+      "@shared/*": ["./shared/src/*"],
+      "@tcas/*": ["./tcas/src/*"],
+      "@typings/*": ["../../../fbw-common/src/typings/*"],
+      "@flybywiresim/fbw-sdk": ["../../../fbw-common/src/systems/index-no-react.ts"],
+    }
+  }
+}
diff --git a/fbw-a380x/src/systems/instruments/src/Common/LegacyCdsDisplayUnit.tsx b/fbw-a380x/src/systems/instruments/src/Common/LegacyCdsDisplayUnit.tsx
index 015199ccdfd..93f210bbed8 100644
--- a/fbw-a380x/src/systems/instruments/src/Common/LegacyCdsDisplayUnit.tsx
+++ b/fbw-a380x/src/systems/instruments/src/Common/LegacyCdsDisplayUnit.tsx
@@ -45,6 +45,7 @@ const DisplayUnitToPotentiometer: { [k in DisplayUnitID]: number } = {
 interface DisplayUnitProps {
   displayUnitId: DisplayUnitID;
   failed?: boolean;
+  hideBootTestScreens?: boolean;
 }
 
 enum DisplayUnitState {
@@ -63,7 +64,7 @@ function BacklightBleed(props) {
 }
 
 export const LegacyCdsDisplayUnit = forwardRef<SVGSVGElement, PropsWithChildren<DisplayUnitProps>>(
-  ({ displayUnitId, failed, children }, ref) => {
+  ({ displayUnitId, failed, hideBootTestScreens, children }, ref) => {
     const [coldDark] = useSimVar('L:A32NX_COLD_AND_DARK_SPAWN' /* TODO 380 simvar */, 'Bool', 200);
     const [state, setState] = useState(coldDark ? DisplayUnitState.Off : DisplayUnitState.Standby);
     const [timer, setTimer] = useState<number | null>(null);
@@ -167,7 +168,7 @@ export const LegacyCdsDisplayUnit = forwardRef<SVGSVGElement, PropsWithChildren<
       );
     }
 
-    if (state === DisplayUnitState.ThalesBootup) {
+    if (state === DisplayUnitState.ThalesBootup && !hideBootTestScreens) {
       return (
         <>
           <BacklightBleed homeCockpit={homeCockpit} />
@@ -181,7 +182,7 @@ export const LegacyCdsDisplayUnit = forwardRef<SVGSVGElement, PropsWithChildren<
       );
     }
 
-    if (state === DisplayUnitState.Selftest) {
+    if (state === DisplayUnitState.Selftest && !hideBootTestScreens) {
       return (
         <>
           <BacklightBleed homeCockpit={homeCockpit} />
diff --git a/fbw-a380x/src/systems/instruments/src/FCU/Managers/VerticalSpeedManager.ts b/fbw-a380x/src/systems/instruments/src/FCU/Managers/VerticalSpeedManager.ts
index 3a1545337f1..b371fcc44a6 100644
--- a/fbw-a380x/src/systems/instruments/src/FCU/Managers/VerticalSpeedManager.ts
+++ b/fbw-a380x/src/systems/instruments/src/FCU/Managers/VerticalSpeedManager.ts
@@ -60,22 +60,6 @@ export class VerticalSpeedManager extends TemporaryHax implements Instrument {
     this.refresh(false, false, 0, 0, true);
   }
 
-  private onPush(): void {
-    const mode = SimVar.GetSimVarValue('L:A32NX_FMA_VERTICAL_MODE', 'Number');
-    if (mode >= 32 && mode <= 34) {
-      return;
-    }
-    clearTimeout(this._resetSelectionTimeout);
-    this.forceUpdate = true;
-
-    this.currentState = A320_Neo_FCU_VSpeed_State.Zeroing;
-
-    this.selectedVs = 0;
-    this.selectedFpa = 0;
-
-    SimVar.SetSimVarValue('K:A32NX.FCU_TO_AP_VS_PUSH', 'number', 0);
-  }
-
   private onRotate(): void {
     if (
       this.currentState === A320_Neo_FCU_VSpeed_State.Idle ||
@@ -275,8 +259,6 @@ export class VerticalSpeedManager extends TemporaryHax implements Instrument {
         this.ABS_MINMAX_FPA,
       );
       this.onRotate();
-    } else if (_event === 'VS_PUSH') {
-      this.onPush();
     } else if (_event === 'VS_PULL') {
       this.onPull();
     } else if (_event === 'VS_SET') {
diff --git a/fbw-a380x/src/systems/instruments/src/MFD/MFD.tsx b/fbw-a380x/src/systems/instruments/src/MFD/MFD.tsx
index 87c5fe4136e..f3089fdd04b 100644
--- a/fbw-a380x/src/systems/instruments/src/MFD/MFD.tsx
+++ b/fbw-a380x/src/systems/instruments/src/MFD/MFD.tsx
@@ -263,11 +263,15 @@ export class MfdComponent extends DisplayComponent<MfdComponentProps> implements
       this.activeUriChanged(uri);
     });
 
-    this.topRef.instance.addEventListener('mousemove', (ev) => {
-      this.mouseCursorRef.getOrDefault()?.updatePosition(ev.clientX, ev.clientY);
-    });
+    this.topRef.instance.addEventListener('mousemove', this.onMouseMoveHandler);
+  }
+
+  private onMouseMove(ev: MouseEvent) {
+    this.mouseCursorRef.getOrDefault()?.updatePosition(ev.clientX, ev.clientY);
   }
 
+  private onMouseMoveHandler = this.onMouseMove.bind(this);
+
   private activeUriChanged(uri: ActiveUriInformation) {
     if (!this.props.fmcService.master) {
       return;
@@ -325,6 +329,12 @@ export class MfdComponent extends DisplayComponent<MfdComponentProps> implements
     // Will be called if the FMC providing all the data has changed.
   }
 
+  destroy(): void {
+    this.topRef.getOrDefault()?.removeEventListener('mousemove', this.onMouseMoveHandler);
+
+    super.destroy();
+  }
+
   render(): VNode {
     return (
       <CdsDisplayUnit
diff --git a/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/MfdFmsFpln.tsx b/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/MfdFmsFpln.tsx
index 10ff1c73c42..9d5b9d5458d 100644
--- a/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/MfdFmsFpln.tsx
+++ b/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/MfdFmsFpln.tsx
@@ -1216,19 +1216,34 @@ class FplnLegLine extends DisplayComponent<FplnLegLineProps> {
       }),
     );
 
-    this.identRef.getOrDefault()?.addEventListener('click', () => {
-      if (this.props.data.get()?.originalLegIndex !== null && this.props.data.get()?.originalLegIndex !== undefined) {
-        this.props.openRevisionsMenuCallback();
-        this.selectedForRevision.set(true);
-      }
-    });
+    this.identRef.getOrDefault()?.addEventListener('click', this.onIdentClickedHandler);
+
+    this.timeRef.getOrDefault()?.parentElement?.addEventListener('click', this.props.callbacks.rta);
+  }
 
-    this.timeRef.getOrDefault()?.parentElement?.addEventListener('click', () => this.props.callbacks.rta());
+  private onIdentClicked() {
+    if (this.props.data.get()?.originalLegIndex !== null && this.props.data.get()?.originalLegIndex !== undefined) {
+      this.props.openRevisionsMenuCallback();
+      this.selectedForRevision.set(true);
+    }
   }
 
+  private onIdentClickedHandler = this.onIdentClicked.bind(this);
+
   public destroy(): void {
     this.subs.forEach((sub) => sub.destroy());
     this.lineColor.destroy();
+
+    this.identRef.getOrDefault()?.removeEventListener('click', this.onIdentClickedHandler);
+    this.timeRef.getOrDefault()?.parentElement?.removeEventListener('click', this.props.callbacks.rta);
+
+    if (this.props.displayEfobAndWind.get()) {
+      this.altRef.getOrDefault()?.parentElement?.addEventListener('click', this.props.callbacks.wind);
+    } else {
+      this.altRef.getOrDefault()?.parentElement?.addEventListener('click', this.props.callbacks.altitude);
+      this.speedRef.getOrDefault()?.parentElement?.addEventListener('click', this.props.callbacks.speed);
+    }
+
     super.destroy();
   }
 
@@ -1346,12 +1361,12 @@ class FplnLegLine extends DisplayComponent<FplnLegLineProps> {
     }
 
     while (this.speedRef.instance.firstChild) {
-      this.speedRef.instance.parentElement?.removeEventListener('click', () => this.props.callbacks.speed());
+      this.speedRef.instance.parentElement?.removeEventListener('click', this.props.callbacks.speed);
       this.speedRef.instance.removeChild(this.speedRef.instance.firstChild);
     }
     while (this.altRef.instance.firstChild) {
-      this.altRef.instance.parentElement?.removeEventListener('click', () => this.props.callbacks.altitude());
-      this.altRef.instance.parentElement?.removeEventListener('click', () => this.props.callbacks.wind());
+      this.altRef.instance.parentElement?.removeEventListener('click', this.props.callbacks.altitude);
+      this.altRef.instance.parentElement?.removeEventListener('click', this.props.callbacks.wind);
       this.altRef.instance.removeChild(this.altRef.instance.firstChild);
     }
     FSComponent.render(this.efobOrSpeed(data), this.speedRef.instance);
@@ -1360,7 +1375,7 @@ class FplnLegLine extends DisplayComponent<FplnLegLineProps> {
     if (this.props.displayEfobAndWind.get()) {
       this.altRef.instance.style.alignSelf = 'flex-end';
       this.altRef.instance.style.paddingRight = '20px';
-      this.altRef.instance.parentElement?.addEventListener('click', () => this.props.callbacks.wind());
+      this.altRef.instance.parentElement?.addEventListener('click', this.props.callbacks.wind);
       this.speedRef.instance.style.paddingLeft = '10px';
       if (this.speedRef.instance.parentElement) {
         this.speedRef.instance.parentElement.className = 'mfd-fms-fpln-label-small';
@@ -1368,9 +1383,9 @@ class FplnLegLine extends DisplayComponent<FplnLegLineProps> {
     } else {
       this.altRef.instance.style.alignSelf = '';
       this.altRef.instance.style.paddingRight = '';
-      this.altRef.instance.parentElement?.addEventListener('click', () => this.props.callbacks.altitude());
+      this.altRef.instance.parentElement?.addEventListener('click', this.props.callbacks.altitude);
       this.speedRef.instance.style.paddingLeft = '';
-      this.speedRef.instance.parentElement?.addEventListener('click', () => this.props.callbacks.speed());
+      this.speedRef.instance.parentElement?.addEventListener('click', this.props.callbacks.speed);
       if (this.speedRef.instance.parentElement) {
         this.speedRef.instance.parentElement.className = 'mfd-fms-fpln-label-small-clickable';
       }
diff --git a/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/MfdFmsFplnDuplicateNames.tsx b/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/MfdFmsFplnDuplicateNames.tsx
index de00607f3c8..28b58c29b52 100644
--- a/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/MfdFmsFplnDuplicateNames.tsx
+++ b/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/MfdFmsFplnDuplicateNames.tsx
@@ -139,15 +139,16 @@ export class MfdFmsFplnDuplicateNames extends DisplayComponent<MfdFmsFplnDuplica
         );
         FSComponent.render(node, this.linesDivRef.instance);
 
-        // These don't get explicitly deleted when re-rendering the list, TODO check if critical
-        document.getElementById(`mfd-fms-dupl-${i}`)?.addEventListener('click', () => {
-          this.callback(this.duplicateOptions.get()[i].fixData);
-          this.props.visible.set(false);
-        });
+        document.getElementById(`mfd-fms-dupl-${i}`)?.addEventListener('click', this.itemClickedHandler.bind(this, i));
       }
     }
   }
 
+  private itemClickedHandler(i: number) {
+    this.callback(this.duplicateOptions.get()[i].fixData);
+    this.props.visible.set(false);
+  }
+
   // Entry point after opening this dialog
   public deduplicateFacilities<T extends DatabaseItem<any>>(
     items: T[],
@@ -163,6 +164,14 @@ export class MfdFmsFplnDuplicateNames extends DisplayComponent<MfdFmsFplnDuplica
     // Destroy all subscriptions to remove all references to this instance.
     this.subs.forEach((x) => x.destroy());
 
+    for (let i = 0; i < this.duplicateOptions.get().length; i++) {
+      if (this.duplicateOptions.get()[i] !== undefined) {
+        document
+          .getElementById(`mfd-fms-dupl-${i}`)
+          ?.removeEventListener('click', this.itemClickedHandler.bind(this, i));
+      }
+    }
+
     super.destroy();
   }
 
diff --git a/fbw-a380x/src/systems/instruments/src/MFD/pages/SURV/MfdSurvControls.tsx b/fbw-a380x/src/systems/instruments/src/MFD/pages/SURV/MfdSurvControls.tsx
index da951ca61f5..b1534218054 100644
--- a/fbw-a380x/src/systems/instruments/src/MFD/pages/SURV/MfdSurvControls.tsx
+++ b/fbw-a380x/src/systems/instruments/src/MFD/pages/SURV/MfdSurvControls.tsx
@@ -165,8 +165,8 @@ export class MfdSurvControls extends DisplayComponent<MfdSurvControlsProps> {
     }
 
     if (!this.tcasFailed.get()) {
-      this.tcasTaraSelectedIndex.set(0);
-      this.tcasNormAbvBlwSelectedIndex.set(0);
+      this.props.bus.getPublisher<MfdSurvEvents>().pub('mfd_tcas_alert_level', 2, true); // TA/RA
+      this.props.bus.getPublisher<MfdSurvEvents>().pub('mfd_tcas_alt_select', 0, true); // NORM
     }
 
     if (!this.wxrFailed.get()) {
diff --git a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/Button.tsx b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/Button.tsx
index 82c83e5654e..2d898840907 100644
--- a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/Button.tsx
+++ b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/Button.tsx
@@ -46,12 +46,21 @@ export class Button extends DisplayComponent<ButtonProps> {
 
   private renderedMenuItems: ButtonMenuItem[] = [];
 
-  private clickHandler(): void {
+  private onClick() {
     if (!this.props.disabled?.get()) {
       this.props.onClick();
     }
   }
 
+  private onClickHandler = this.onClick.bind(this);
+
+  onDropdownMenuElementClick(val: ButtonMenuItem) {
+    val.action();
+    this.dropdownIsOpened.set(false);
+  }
+
+  private onDropdownMenuElementClickHandler = this.onDropdownMenuElementClick.bind(this);
+
   private scrollMenuTo(elementIndex: number) {
     // Assume 36px height for each menu item div
     this.dropdownMenuRef.instance.scrollTo({ behavior: 'instant', left: 0, top: elementIndex * 36 });
@@ -78,7 +87,7 @@ export class Button extends DisplayComponent<ButtonProps> {
     if (this.props.showArrow === undefined) {
       this.props.showArrow = true;
     }
-    this.buttonRef.instance.addEventListener('click', () => this.clickHandler());
+    this.buttonRef.instance.addEventListener('click', this.onClickHandler);
 
     this.subs.push(
       this.props.disabled.sub((val) => {
@@ -106,10 +115,9 @@ export class Button extends DisplayComponent<ButtonProps> {
         this.props.menuItems.sub((items) => {
           // Delete click handler, delete dropdownMenuRef children, render dropdownMenuRef children,
           this.renderedMenuItems?.forEach((val, i) => {
-            document.getElementById(`${this.props.idPrefix}_${i}`)?.removeEventListener('click', () => {
-              val.action();
-              this.dropdownIsOpened.set(false);
-            });
+            document
+              .getElementById(`${this.props.idPrefix}_${i}`)
+              ?.removeEventListener('click', this.onDropdownMenuElementClickHandler.bind(this, val));
           });
 
           // Delete dropdownMenuRef's children
@@ -136,10 +144,9 @@ export class Button extends DisplayComponent<ButtonProps> {
 
           // Add click event listener
           items?.forEach((val, i) => {
-            document.getElementById(`${this.props.idPrefix}_${i}`)?.addEventListener('click', () => {
-              val.action();
-              this.dropdownIsOpened.set(false);
-            });
+            document
+              .getElementById(`${this.props.idPrefix}_${i}`)
+              ?.addEventListener('click', this.onDropdownMenuElementClickHandler.bind(this, val));
           });
 
           // Check if menu would overflow vertically (i.e. leave screen at the bottom). If so, open menu upwards
@@ -191,17 +198,9 @@ export class Button extends DisplayComponent<ButtonProps> {
     );
 
     // Close dropdown menu if clicked outside
-    document.getElementById('MFD_CONTENT')?.addEventListener('click', (e) => {
-      if (!this.topRef.getOrDefault()?.contains(e.target as Node) && this.dropdownIsOpened.get()) {
-        this.dropdownIsOpened.set(false);
-      }
-    });
-
-    this.buttonRef.instance.addEventListener('click', () => {
-      if (this.props.menuItems && this.props.menuItems.get().length > 0 && !this.props.disabled?.get()) {
-        this.dropdownIsOpened.set(!this.dropdownIsOpened.get());
-      }
-    });
+    document.getElementById('MFD_CONTENT')?.addEventListener('click', this.onCloseDropdownHandler);
+
+    this.buttonRef.instance.addEventListener('click', this.onButtonClickHandler);
 
     this.subs.push(
       this.dropdownIsOpened.sub((val) => {
@@ -230,10 +229,30 @@ export class Button extends DisplayComponent<ButtonProps> {
     }
   }
 
+  private onCloseDropdown(e: MouseEvent) {
+    if (!this.topRef.getOrDefault()?.contains(e.target as Node) && this.dropdownIsOpened.get()) {
+      this.dropdownIsOpened.set(false);
+    }
+  }
+
+  private onCloseDropdownHandler = this.onCloseDropdown.bind(this);
+
+  private onButtonClick() {
+    if (this.props.menuItems && this.props.menuItems.get().length > 0 && !this.props.disabled?.get()) {
+      this.dropdownIsOpened.set(!this.dropdownIsOpened.get());
+    }
+  }
+
+  private onButtonClickHandler = this.onButtonClick.bind(this);
+
   public destroy(): void {
     // Destroy all subscriptions to remove all references to this instance.
     this.subs.forEach((x) => x.destroy());
 
+    this.buttonRef.getOrDefault()?.removeEventListener('click', this.onClickHandler);
+    document.getElementById('MFD_CONTENT')?.removeEventListener('click', this.onCloseDropdownHandler);
+    this.buttonRef.getOrDefault()?.removeEventListener('click', this.onButtonClickHandler);
+
     super.destroy();
   }
 
diff --git a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/ContextMenu.tsx b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/ContextMenu.tsx
index 152e835a609..43ccdd7da09 100644
--- a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/ContextMenu.tsx
+++ b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/ContextMenu.tsx
@@ -60,12 +60,9 @@ export class ContextMenu extends DisplayComponent<ContextMenuProps> {
       this.props.values.sub((items) => {
         // Delete click handler, delete contextMenuRef children, render contextMenuRef children,
         this.renderedMenuItems?.forEach((val, i) => {
-          document.getElementById(`${this.props.idPrefix}_${i}`)?.removeEventListener('click', () => {
-            if (!val.disabled) {
-              this.hideMenu();
-              val.onPressed();
-            }
-          });
+          document
+            .getElementById(`${this.props.idPrefix}_${i}`)
+            ?.removeEventListener('click', this.onItemClick.bind(this, val));
         });
 
         // Delete contextMenuRef's children
@@ -95,24 +92,32 @@ export class ContextMenu extends DisplayComponent<ContextMenuProps> {
 
         // Add click event listener
         items?.forEach((val, i) => {
-          document.getElementById(`${this.props.idPrefix}_${i}`)?.addEventListener('click', () => {
-            if (!val.disabled) {
-              this.hideMenu();
-              val.onPressed();
-            }
-          });
+          document
+            .getElementById(`${this.props.idPrefix}_${i}`)
+            ?.addEventListener('click', this.onItemClick.bind(this, val));
         });
       }, true),
     );
 
     // Close dropdown menu if clicked outside
-    document.getElementById('MFD_CONTENT')?.addEventListener('click', () => {
-      if (Date.now() - this.openedAt > 100 && this.props.opened.get() === true) {
-        this.hideMenu();
-      }
-    });
+    document.getElementById('MFD_CONTENT')?.addEventListener('click', this.onCloseHandler);
   }
 
+  private onItemClick(val: ContextMenuElement) {
+    if (!val.disabled) {
+      this.hideMenu();
+      val.onPressed();
+    }
+  }
+
+  private onClose() {
+    if (Date.now() - this.openedAt > 100 && this.props.opened.get() === true) {
+      this.hideMenu();
+    }
+  }
+
+  private onCloseHandler = this.onClose.bind(this);
+
   render(): VNode {
     return <div ref={this.contextMenuRef} class="mfd-context-menu" />;
   }
diff --git a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/DropdownMenu.tsx b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/DropdownMenu.tsx
index 6fdb9167a21..893e388d4dd 100644
--- a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/DropdownMenu.tsx
+++ b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/DropdownMenu.tsx
@@ -71,15 +71,15 @@ export class DropdownMenu extends DisplayComponent<DropdownMenuProps> {
     true,
   );
 
-  clickHandler(i: number, thisArg: DropdownMenu) {
+  private onClick(i: number) {
     if (!this.props.inactive?.get()) {
       this.freeTextEntered = false;
-      if (thisArg.props.onModified) {
-        thisArg.props.onModified(this.renderedDropdownOptionsIndices[i], '');
+      if (this.props.onModified) {
+        this.props.onModified(this.renderedDropdownOptionsIndices[i], '');
       } else {
-        thisArg.props.selectedIndex.set(this.renderedDropdownOptionsIndices[i]);
+        this.props.selectedIndex.set(this.renderedDropdownOptionsIndices[i]);
       }
-      thisArg.dropdownIsOpened.set(false);
+      this.dropdownIsOpened.set(false);
       this.filterList('');
     }
   }
@@ -102,7 +102,7 @@ export class DropdownMenu extends DisplayComponent<DropdownMenuProps> {
 
   private filterList(text: string) {
     const arr = this.props.values.getArray();
-    this.renderedDropdownOptionsIndices = arr.map((val, idx) => idx).filter((val, idx) => arr[idx].startsWith(text));
+    this.renderedDropdownOptionsIndices = arr.map((val, idx) => idx).filter((_, idx) => arr[idx].startsWith(text));
     this.renderedDropdownOptions.set(arr.filter((val) => val.startsWith(text)));
   }
 
@@ -134,7 +134,7 @@ export class DropdownMenu extends DisplayComponent<DropdownMenuProps> {
           if (document.getElementById(`${this.props.idPrefix}_${i}`)) {
             document
               .getElementById(`${this.props.idPrefix}_${i}`)
-              ?.removeEventListener('click', () => this.clickHandler(i, this));
+              ?.removeEventListener('click', this.onClick.bind(this, i));
           }
         });
 
@@ -158,9 +158,7 @@ export class DropdownMenu extends DisplayComponent<DropdownMenuProps> {
 
         // Add click handlers
         array.forEach((val, i) => {
-          document
-            .getElementById(`${this.props.idPrefix}_${i}`)
-            ?.addEventListener('click', () => this.clickHandler(i, this));
+          document.getElementById(`${this.props.idPrefix}_${i}`)?.addEventListener('click', this.onClick.bind(this, i));
         });
       }),
     );
@@ -186,18 +184,10 @@ export class DropdownMenu extends DisplayComponent<DropdownMenuProps> {
       }),
     );
 
-    this.dropdownSelectorRef.instance.addEventListener('click', () => {
-      if (!this.props.inactive?.get()) {
-        this.dropdownIsOpened.set(!this.dropdownIsOpened.get());
-      }
-    });
+    this.dropdownSelectorRef.instance.addEventListener('click', this.onOpenCloseClickHandler);
 
     // Close dropdown menu if clicked outside
-    document.getElementById('MFD_CONTENT')?.addEventListener('click', (e) => {
-      if (!this.topRef.getOrDefault()?.contains(e.target as Node) && this.dropdownIsOpened.get()) {
-        this.dropdownIsOpened.set(false);
-      }
-    });
+    document.getElementById('MFD_CONTENT')?.addEventListener('click', this.onClickedOutsideHandler);
 
     this.subs.push(
       this.dropdownIsOpened.sub((val) => {
@@ -233,6 +223,22 @@ export class DropdownMenu extends DisplayComponent<DropdownMenuProps> {
     // TODO add KCCU events
   }
 
+  private onOpenCloseClick() {
+    if (!this.props.inactive?.get()) {
+      this.dropdownIsOpened.set(!this.dropdownIsOpened.get());
+    }
+  }
+
+  private onOpenCloseClickHandler = this.onOpenCloseClick.bind(this);
+
+  private onClickedOutside(e: MouseEvent) {
+    if (!this.topRef.getOrDefault()?.contains(e.target as Node) && this.dropdownIsOpened.get()) {
+      this.dropdownIsOpened.set(false);
+    }
+  }
+
+  private onClickedOutsideHandler = this.onClickedOutside.bind(this);
+
   /**
    * Scrolls the dropdown list to the given index
    *
@@ -252,6 +258,9 @@ export class DropdownMenu extends DisplayComponent<DropdownMenuProps> {
     // Destroy all subscriptions to remove all references to this instance.
     this.subs.forEach((x) => x.destroy());
 
+    this.dropdownSelectorRef.getOrDefault()?.removeEventListener('click', this.onOpenCloseClickHandler);
+    document.getElementById('MFD_CONTENT')?.removeEventListener('click', this.onClickedOutsideHandler);
+
     super.destroy();
   }
 
diff --git a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/IconButton.tsx b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/IconButton.tsx
index 26d5f84b01d..c4fcc53fcf6 100644
--- a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/IconButton.tsx
+++ b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/IconButton.tsx
@@ -29,12 +29,14 @@ export class IconButton extends DisplayComponent<IconButtonProps> {
 
   private fillColor = Subject.create('white');
 
-  clickHandler(): void {
+  private onClick() {
     if (!this.props?.disabled?.get() && this.props.onClick !== undefined) {
       this.props.onClick();
     }
   }
 
+  private onClickHandler = this.onClick.bind(this);
+
   updateSvgColor(color: string) {
     if (this.svgGroupRef) {
       this.svgGroupRef.getOrDefault()?.setAttribute('fill', color);
@@ -58,13 +60,15 @@ export class IconButton extends DisplayComponent<IconButtonProps> {
       }, true),
     );
 
-    this.spanRef.instance.addEventListener('click', () => this.clickHandler());
+    this.spanRef.instance.addEventListener('click', this.onClickHandler);
   }
 
   public destroy(): void {
     // Destroy all subscriptions to remove all references to this instance.
     this.subs.forEach((x) => x.destroy());
 
+    this.spanRef.getOrDefault()?.removeEventListener('click', this.onClickHandler);
+
     super.destroy();
   }
 
diff --git a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/InputField.tsx b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/InputField.tsx
index bdb567abc7d..1f01fc8a02c 100644
--- a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/InputField.tsx
+++ b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/InputField.tsx
@@ -176,6 +176,8 @@ export class InputField<T> extends DisplayComponent<InputFieldProps<T>> {
     }
   }
 
+  private onKeyDownHandler = this.onKeyDown.bind(this);
+
   private handleBackspace() {
     if (this.modifiedFieldValue.get() === null && this.props.canBeCleared?.get()) {
       this.modifiedFieldValue.set('');
@@ -188,7 +190,7 @@ export class InputField<T> extends DisplayComponent<InputFieldProps<T>> {
     this.onInput();
   }
 
-  private onKeyPress(ev: KeyboardEvent) {
+  private onKeyPress = (ev: KeyboardEvent) => {
     if (!this.isFocused.get()) {
       return;
     }
@@ -210,9 +212,11 @@ export class InputField<T> extends DisplayComponent<InputFieldProps<T>> {
     if (key === ',') {
       this.handleKeyInput('.');
     }
-  }
+  };
 
-  private handleKeyInput(key: string) {
+  private onKeyPressHandler = this.onKeyPress.bind(this);
+
+  private handleKeyInput = (key: string) => {
     if (this.modifiedFieldValue.get() === null) {
       this.modifiedFieldValue.set('');
       this.spanningDivRef.instance.style.justifyContent = 'flex-start';
@@ -224,7 +228,7 @@ export class InputField<T> extends DisplayComponent<InputFieldProps<T>> {
     }
 
     this.onInput();
-  }
+  };
 
   private handleEnter() {
     if (this.props.handleFocusBlurExternally) {
@@ -263,6 +267,8 @@ export class InputField<T> extends DisplayComponent<InputFieldProps<T>> {
     }
   }
 
+  private onFocusHandler = this.onFocus.bind(this);
+
   public async onBlur(validateAndUpdate: boolean = true) {
     if (!this.props.disabled?.get() && !this.props.inactive?.get() && this.isFocused.get()) {
       if (this.props.interactionMode.get() === InteractionMode.Touchscreen) {
@@ -353,6 +359,12 @@ export class InputField<T> extends DisplayComponent<InputFieldProps<T>> {
     this.isValidating.set(false);
   }
 
+  private onFocusTextInput() {
+    this.textInputRef.instance.focus();
+  }
+
+  private onFocusTextInputHandler = this.onFocusTextInput.bind(this);
+
   onAfterRender(node: VNode): void {
     super.onAfterRender(node);
 
@@ -483,23 +495,15 @@ export class InputField<T> extends DisplayComponent<InputFieldProps<T>> {
       this.subs.push(this.props.dataEntryFormat.reFormatTrigger.sub(() => this.updateDisplayElement()));
     }
 
-    this.textInputRef.instance.addEventListener('keypress', (ev) => this.onKeyPress(ev));
-    this.textInputRef.instance.addEventListener('keydown', (ev) => this.onKeyDown(ev));
+    this.textInputRef.instance.addEventListener('keypress', this.onKeyPressHandler);
+    this.textInputRef.instance.addEventListener('keydown', this.onKeyDownHandler);
 
     if (!this.props.handleFocusBlurExternally) {
-      this.textInputRef.instance.addEventListener('focus', () => this.onFocus());
-      this.textInputRef.instance.addEventListener('blur', () => {
-        this.onBlur();
-      });
-      this.spanningDivRef.instance.addEventListener('click', () => {
-        this.textInputRef.instance.focus();
-      });
-      this.leadingUnitRef.instance.addEventListener('click', () => {
-        this.textInputRef.instance.focus();
-      });
-      this.trailingUnitRef.instance.addEventListener('click', () => {
-        this.textInputRef.instance.focus();
-      });
+      this.textInputRef.instance.addEventListener('focus', this.onFocusHandler);
+      this.textInputRef.instance.addEventListener('blur', this.onBlur.bind(this, true));
+      this.spanningDivRef.instance.addEventListener('click', this.onFocusTextInputHandler);
+      this.leadingUnitRef.instance.addEventListener('click', this.onFocusTextInputHandler);
+      this.trailingUnitRef.instance.addEventListener('click', this.onFocusTextInputHandler);
     }
 
     this.props.hEventConsumer.handle((key) => {
@@ -568,6 +572,24 @@ export class InputField<T> extends DisplayComponent<InputFieldProps<T>> {
         } */
   }
 
+  destroy(): void {
+    // Destroy all subscriptions to remove all references to this instance.
+    this.subs.forEach((x) => x.destroy());
+
+    this.textInputRef.getOrDefault()?.removeEventListener('keypress', this.onKeyPressHandler);
+    this.textInputRef.getOrDefault()?.removeEventListener('keydown', this.onKeyDownHandler);
+
+    if (!this.props.handleFocusBlurExternally) {
+      this.textInputRef.getOrDefault()?.removeEventListener('focus', this.onFocusHandler);
+      this.textInputRef.getOrDefault()?.removeEventListener('blur', this.onBlur.bind(this, true));
+      this.spanningDivRef.getOrDefault()?.removeEventListener('click', this.onFocusTextInputHandler);
+      this.leadingUnitRef.getOrDefault()?.removeEventListener('click', this.onFocusTextInputHandler);
+      this.trailingUnitRef.getOrDefault()?.removeEventListener('click', this.onFocusTextInputHandler);
+    }
+
+    super.destroy();
+  }
+
   render(): VNode {
     return (
       <div ref={this.topRef} class="mfd-input-field-root">
diff --git a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/PageSelectorDropdownMenu.tsx b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/PageSelectorDropdownMenu.tsx
index 3c7ef7faf63..3e4a956acfe 100644
--- a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/PageSelectorDropdownMenu.tsx
+++ b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/PageSelectorDropdownMenu.tsx
@@ -37,32 +37,44 @@ export class PageSelectorDropdownMenu extends DisplayComponent<PageSelectorDropd
 
   private dropdownIsOpened = Subject.create(false);
 
+  private onMenuItemClick(val: PageSelectorMenuItem) {
+    if (!val.disabled) {
+      val.action();
+      this.dropdownIsOpened.set(false);
+    }
+  }
+
+  private onClickedOutside = (e: MouseEvent) => {
+    if (!this.topRef.getOrDefault()?.contains(e.target as Node) && this.dropdownIsOpened.get()) {
+      this.dropdownIsOpened.set(false);
+    }
+  };
+
+  private onClickedOutsideHandler = this.onClickedOutside.bind(this);
+
+  private onOpenCloseDropdown() {
+    if (this.props.menuItems.length > 1) {
+      this.dropdownIsOpened.set(!this.dropdownIsOpened.get());
+    } else if (this.props.menuItems.length === 1) {
+      this.props.menuItems[0].action();
+    }
+  }
+
+  private onOpenCloseDropdownHandler = this.onOpenCloseDropdown.bind(this);
+
   onAfterRender(node: VNode): void {
     super.onAfterRender(node);
 
     this.props.menuItems.forEach((val, i) => {
-      document.getElementById(`${this.props.idPrefix}_${i}`)?.addEventListener('click', () => {
-        if (!val.disabled) {
-          val.action();
-          this.dropdownIsOpened.set(false);
-        }
-      });
+      document
+        .getElementById(`${this.props.idPrefix}_${i}`)
+        ?.addEventListener('click', this.onMenuItemClick.bind(this, val));
     });
 
     // Close dropdown menu if clicked outside
-    document.getElementById('MFD_CONTENT')?.addEventListener('click', (e) => {
-      if (!this.topRef.getOrDefault()?.contains(e.target as Node) && this.dropdownIsOpened.get()) {
-        this.dropdownIsOpened.set(false);
-      }
-    });
+    document.getElementById('MFD_CONTENT')?.addEventListener('click', this.onClickedOutsideHandler);
 
-    this.dropdownSelectorRef.instance.addEventListener('click', () => {
-      if (this.props.menuItems.length > 1) {
-        this.dropdownIsOpened.set(!this.dropdownIsOpened.get());
-      } else if (this.props.menuItems.length === 1) {
-        this.props.menuItems[0].action();
-      }
-    });
+    this.dropdownSelectorRef.instance.addEventListener('click', this.onOpenCloseDropdownHandler);
 
     this.subs.push(
       this.dropdownIsOpened.sub((val) => {
@@ -80,6 +92,14 @@ export class PageSelectorDropdownMenu extends DisplayComponent<PageSelectorDropd
     // Destroy all subscriptions to remove all references to this instance.
     this.subs.forEach((x) => x.destroy());
 
+    this.props.menuItems.forEach((val, i) => {
+      document
+        .getElementById(`${this.props.idPrefix}_${i}`)
+        ?.removeEventListener('click', this.onMenuItemClick.bind(this, val));
+    });
+    document.getElementById('MFD_CONTENT')?.removeEventListener('click', this.onClickedOutsideHandler);
+    this.dropdownSelectorRef.getOrDefault()?.removeEventListener('click', this.onOpenCloseDropdownHandler);
+
     super.destroy();
   }
 
diff --git a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/RadioButtonGroup.tsx b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/RadioButtonGroup.tsx
index e6aa0505d90..6e36414f711 100644
--- a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/RadioButtonGroup.tsx
+++ b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/RadioButtonGroup.tsx
@@ -25,6 +25,14 @@ export class RadioButtonGroup extends DisplayComponent<RadioButtonGroupProps> {
   // Make sure to collect all subscriptions here, otherwise page navigation doesn't work.
   private subs = [] as Subscription[];
 
+  private changeEventHandler(i: number) {
+    if (this.props.onModified) {
+      this.props.onModified(i);
+    } else {
+      this.props.selectedIndex.set(i);
+    }
+  }
+
   onAfterRender(node: VNode): void {
     super.onAfterRender(node);
 
@@ -36,13 +44,9 @@ export class RadioButtonGroup extends DisplayComponent<RadioButtonGroupProps> {
     }
 
     for (let i = 0; i < this.props.values.length; i++) {
-      document.getElementById(`${this.props.idPrefix}_${i}`)?.addEventListener('change', () => {
-        if (this.props.onModified) {
-          this.props.onModified(i);
-        } else {
-          this.props.selectedIndex.set(i);
-        }
-      });
+      document
+        .getElementById(`${this.props.idPrefix}_${i}`)
+        ?.addEventListener('change', this.changeEventHandler.bind(this, i));
     }
 
     this.subs.push(
@@ -87,6 +91,12 @@ export class RadioButtonGroup extends DisplayComponent<RadioButtonGroupProps> {
     // Destroy all subscriptions to remove all references to this instance.
     this.subs.forEach((x) => x.destroy());
 
+    for (let i = 0; i < this.props.values.length; i++) {
+      document
+        .getElementById(`${this.props.idPrefix}_${i}`)
+        ?.removeEventListener('change', this.changeEventHandler.bind(this, i));
+    }
+
     super.destroy();
   }
 
diff --git a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/SurvButton.tsx b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/SurvButton.tsx
index ce9e0b8ab48..a1af2c7361f 100644
--- a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/SurvButton.tsx
+++ b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/SurvButton.tsx
@@ -55,19 +55,21 @@ export class SurvButton extends DisplayComponent<SurvButtonProps> {
     this.props.disabled ?? Subject.create(false),
   );
 
-  private clickHandler(): void {
+  private onClick() {
     if (!this.props.disabled?.get()) {
       this.props.onChanged(!this.props.state.get());
     }
   }
 
+  private onClickHandler = this.onClick.bind(this);
+
   public onAfterRender(node: VNode): void {
     super.onAfterRender(node);
 
     if (this.props.disabled === undefined) {
       this.props.disabled = Subject.create(false);
     }
-    this.topRef.instance.addEventListener('click', () => this.clickHandler());
+    this.topRef.instance.addEventListener('click', this.onClickHandler);
 
     this.subs.push(
       this.props.disabled.sub((val) => {
@@ -84,6 +86,8 @@ export class SurvButton extends DisplayComponent<SurvButtonProps> {
     // Destroy all subscriptions to remove all references to this instance.
     this.subs.forEach((x) => x.destroy());
 
+    this.topRef.getOrDefault()?.removeEventListener('click', this.onClickHandler);
+
     super.destroy();
   }
 
diff --git a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/TopTabNavigator.tsx b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/TopTabNavigator.tsx
index f80c31d30bc..7518739f4a1 100644
--- a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/TopTabNavigator.tsx
+++ b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/TopTabNavigator.tsx
@@ -32,6 +32,12 @@ class TopTabElement extends DisplayComponent<TopTabElementProps> {
     }
   }
 
+  destroy(): void {
+    this.divRef.instance.removeEventListener('click', this.props.onClick);
+
+    super.destroy();
+  }
+
   render(): VNode {
     return (
       <div ref={this.divRef} class={`mfd-top-tab-navigator-bar-element-outer${this.props.isSelected ? ' active' : ''}`}>
diff --git a/fbw-a380x/src/systems/instruments/src/ND/OansControlPanel.tsx b/fbw-a380x/src/systems/instruments/src/ND/OansControlPanel.tsx
index bab45e6c1de..0399dcfdd8d 100644
--- a/fbw-a380x/src/systems/instruments/src/ND/OansControlPanel.tsx
+++ b/fbw-a380x/src/systems/instruments/src/ND/OansControlPanel.tsx
@@ -8,7 +8,6 @@ import {
   ArraySubject,
   ClockEvents,
   ComponentProps,
-  ConsumerSubject,
   DisplayComponent,
   EventBus,
   FSComponent,
@@ -22,13 +21,13 @@ import {
   VNode,
 } from '@microsoft/msfs-sdk';
 import {
-  BrakeToVacateUtils,
   ControlPanelAirportSearchMode,
   ControlPanelStore,
   ControlPanelUtils,
   FmsDataStore,
+  MIN_TOUCHDOWN_ZONE_DISTANCE,
   NavigraphAmdbClient,
-  Oanc,
+  OansBrakeToVacateSelection,
   OansControlEvents,
   globalToAirportCoordinates,
 } from '@flybywiresim/oanc';
@@ -146,8 +145,10 @@ export class OansControlPanel extends DisplayComponent<OansProps> {
     this.sub.on('oansRequestedStoppingDistance'),
   );
 
+  // Need to add touchdown zone distance to displayed value. BTV computes from TDZ internally,
+  // but users enter LDA from threshold
   private readonly reqStoppingDistance = this.oansRequestedStoppingDistance.map((it) =>
-    it.isNormalOperation() ? it.value : 0,
+    it.isNormalOperation() ? Math.round(it.value + MIN_TOUCHDOWN_ZONE_DISTANCE) : null,
   );
 
   private readonly fmsLandingRunwayVisibility = this.fmsDataStore.landingRunway.map((rwy) =>
@@ -160,7 +161,7 @@ export class OansControlPanel extends DisplayComponent<OansProps> {
 
   private landingRunwayNavdata: Runway | undefined;
 
-  private btvUtils = new BrakeToVacateUtils(this.props.bus);
+  private btvUtils = new OansBrakeToVacateSelection(this.props.bus);
 
   private readonly airportDatabase = this.navigraphAvailable.map((a) => (a ? 'FBW9027250BB04' : 'N/A'));
 
@@ -170,12 +171,6 @@ export class OansControlPanel extends DisplayComponent<OansProps> {
 
   public interactionMode = Subject.create<InteractionMode>(InteractionMode.Touchscreen);
 
-  private readonly radioAltitude1 = Arinc429LocalVarConsumerSubject.create(this.sub.on('radioAltitude_1'));
-  private readonly radioAltitude2 = Arinc429LocalVarConsumerSubject.create(this.sub.on('radioAltitude_2'));
-  private readonly radioAltitude3 = Arinc429LocalVarConsumerSubject.create(this.sub.on('radioAltitude_3'));
-
-  private readonly fwsFlightPhase = ConsumerSubject.create(this.sub.on('fwcFlightPhase'), 0);
-
   private showLdgShiftPanel() {
     if (this.mapDataLdgShiftPanelRef.getOrDefault() && this.mapDataMainRef.getOrDefault()) {
       this.mapDataLdgShiftPanelRef.instance.style.display = 'flex';
@@ -265,13 +260,6 @@ export class OansControlPanel extends DisplayComponent<OansProps> {
         this.pposLonWord.setWord(value);
       });
 
-    // This lead to BTV being disarmed at 300ft. We'll have to investigate and then fix FIXME
-    /* this.btvUtils.below300ftRaAndLanding.sub((v) => {
-      if (this.navigraphAvailable.get() === false && v && !this.btvUtils.runwayIsSet()) {
-        this.setBtvRunwayFromFmsRunway();
-      }
-    });*/
-
     this.fmsDataStore.landingRunway.sub(async (it) => {
       // Set control panel display
       if (it) {
@@ -319,7 +307,7 @@ export class OansControlPanel extends DisplayComponent<OansProps> {
 
         if (this.arpCoordinates && ppos.lat && this.navigraphAvailable.get() === false) {
           globalToAirportCoordinates(this.arpCoordinates, ppos, this.localPpos);
-          this.btvUtils.updateRemainingDistances(this.localPpos);
+          this.props.bus.getPublisher<FmsOansData>().pub('oansAirportLocalCoordinates', this.localPpos, true);
         }
       });
 
@@ -469,10 +457,7 @@ export class OansControlPanel extends DisplayComponent<OansProps> {
   }
 
   private async setBtvRunwayFromFmsRunway() {
-    [this.landingRunwayNavdata, this.arpCoordinates] = await Oanc.setBtvRunwayFromFmsRunway(
-      this.fmsDataStore,
-      this.btvUtils,
-    );
+    [this.landingRunwayNavdata, this.arpCoordinates] = await this.btvUtils.setBtvRunwayFromFmsRunway(this.fmsDataStore);
 
     if (this.landingRunwayNavdata) {
       this.runwayLda.set(this.landingRunwayNavdata.length.toFixed(0));
@@ -480,6 +465,22 @@ export class OansControlPanel extends DisplayComponent<OansProps> {
     }
   }
 
+  private async btvFallbackSetDistance(distance: number | null) {
+    if (this.navigraphAvailable.get() === false) {
+      if (distance && distance > MIN_TOUCHDOWN_ZONE_DISTANCE && this.landingRunwayNavdata && this.arpCoordinates) {
+        const exitLocation = placeBearingDistance(
+          this.landingRunwayNavdata.thresholdLocation,
+          this.landingRunwayNavdata.bearing,
+          distance / MathUtils.METRES_TO_NAUTICAL_MILES,
+        );
+        const localExitPos: Position = [0, 0];
+        globalToAirportCoordinates(this.arpCoordinates, exitLocation, localExitPos);
+
+        this.btvUtils.selectExitFromManualEntry(distance, localExitPos);
+      }
+    }
+  }
+
   render(): VNode {
     return (
       <>
@@ -631,27 +632,7 @@ export class OansControlPanel extends DisplayComponent<OansProps> {
                       <div>
                         <InputField<number>
                           dataEntryFormat={new LengthFormat(Subject.create(0), Subject.create(4000))}
-                          dataHandlerDuringValidation={async (val) => {
-                            if (this.navigraphAvailable.get() === false) {
-                              SimVar.SetSimVarValue(
-                                'L:A32NX_OANS_BTV_REQ_STOPPING_DISTANCE',
-                                SimVarValueType.Number,
-                                val,
-                              );
-
-                              if (val && this.landingRunwayNavdata && this.arpCoordinates) {
-                                const exitLocation = placeBearingDistance(
-                                  this.landingRunwayNavdata.thresholdLocation,
-                                  this.landingRunwayNavdata.bearing,
-                                  val / MathUtils.METRES_TO_NAUTICAL_MILES,
-                                );
-                                const localExitPos: Position = [0, 9];
-                                globalToAirportCoordinates(this.arpCoordinates, exitLocation, localExitPos);
-
-                                this.btvUtils.selectExitFromManualEntry(val, localExitPos);
-                              }
-                            }
-                          }}
+                          dataHandlerDuringValidation={async (val) => this.btvFallbackSetDistance(val)}
                           value={this.reqStoppingDistance}
                           mandatory={Subject.create(false)}
                           inactive={this.selectedEntityString.map((it) => !it)}
@@ -662,7 +643,11 @@ export class OansControlPanel extends DisplayComponent<OansProps> {
                     </div>
                     <div
                       class="oans-cp-map-data-btv-rwy-length"
-                      style={{ visibility: this.fmsLandingRunwayVisibility }}
+                      style={{
+                        visibility: this.fmsLandingRunwayVisibility.map((it) =>
+                          it === 'hidden' ? 'inherit' : 'hidden',
+                        ),
+                      }}
                     >
                       <div class="mfd-label amber" style="margin-right: 10px;">
                         SELECT LANDING RUNWAY IN FMS
diff --git a/fbw-a380x/src/systems/instruments/src/SD/Mailbox.tsx b/fbw-a380x/src/systems/instruments/src/SD/Mailbox.tsx
deleted file mode 100644
index 3d8dc6b52cd..00000000000
--- a/fbw-a380x/src/systems/instruments/src/SD/Mailbox.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import React, { useRef } from 'react';
-
-import { Layer } from '@instruments/common/utils';
-
-export const Mailbox = () => {
-  const ref = useRef(null);
-
-  return (
-    <>
-      <Layer ref={ref} x={0} y={0}>
-        <rect x={0} y={768} width={768} height={256} fill="transparent" />
-        {/* Lower status */}
-        <path className="SW2 White" d="m 99 768 v 256" />
-        <path className="SW2 White" d="m 360 992 v 32" />
-        <path className="SW2 White" d="m 617 768 v 256" />
-        <path className="SW2 White" d="m 99 992 h 518" />
-
-        {/* Message area */}
-        <text className="F26 Green" x={110} y={795} />
-        {/*<text className='F26 Amber' x={110} y={833}>ATC DATALINK COM</text>
-            <text className='F26 Amber' x={110} y={870}>NOT AVAIL</text>*/}
-
-        {/* Buttons */}
-        <Layer x={0} y={970}>
-          <rect x={0} y={0} width={99} height={50} fill="#3c3c3c" strokeWidth={2} stroke="lightgray" />
-          <text className="F24 White" x={5} y={35} fill="#3c3c3c">
-            RECALL
-          </text>
-        </Layer>
-        <Layer x={619} y={768}>
-          <rect x={0} y={0} width={148} height={50} fill="#3c3c3c" strokeWidth={2} stroke="lightgray" />
-          <text className="F24 White" x={68} y={35} fill="#3c3c3c">
-            CLOSE
-          </text>
-        </Layer>
-        <Layer x={619} y={970}>
-          <rect x={0} y={0} width={148} height={50} fill="#3c3c3c" strokeWidth={2} stroke="lightgray" />
-          <text className="F24 White" x={68} y={35} fill="#3c3c3c">
-            PRINT
-          </text>
-        </Layer>
-        {/*{mouse.isOver && <Cursor x={mouse.x!} y={mouse.pageY!} />}*/}
-      </Layer>
-    </>
-  );
-};
diff --git a/fbw-a380x/src/systems/instruments/src/SD/SystemDisplay.tsx b/fbw-a380x/src/systems/instruments/src/SD/SystemDisplay.tsx
index fad025d9080..3c3c5e53592 100644
--- a/fbw-a380x/src/systems/instruments/src/SD/SystemDisplay.tsx
+++ b/fbw-a380x/src/systems/instruments/src/SD/SystemDisplay.tsx
@@ -26,7 +26,6 @@ import { CruisePage } from './Pages/Cruise/CruisePage';
 import { StatusPage } from './Pages/Status/StatusPage';
 
 import { StatusArea } from './StatusArea';
-import { Mailbox } from './Mailbox';
 
 import '../index.scss';
 import { useArinc429Var, useUpdate } from '@flybywiresim/fbw-sdk';
@@ -296,11 +295,10 @@ export const SystemDisplay = () => {
   };
 
   return (
-    <LegacyCdsDisplayUnit displayUnitId={DisplayUnitID.Sd}>
+    <LegacyCdsDisplayUnit displayUnitId={DisplayUnitID.Sd} hideBootTestScreens={true}>
       <g>
         {PAGES[currentPage]}
         <StatusArea />
-        <Mailbox />
       </g>
     </LegacyCdsDisplayUnit>
   );
diff --git a/fbw-a380x/src/systems/systems-host/index.ts b/fbw-a380x/src/systems/systems-host/index.ts
index b5f4449b409..1d93a2a0f3d 100644
--- a/fbw-a380x/src/systems/systems-host/index.ts
+++ b/fbw-a380x/src/systems/systems-host/index.ts
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: GPL-3.0
 
 import {
-  EventBus,
   HEventPublisher,
   InstrumentBackplane,
   Clock,
@@ -19,7 +18,13 @@ import { LegacyFuel } from 'systems-host/systems/LegacyFuel';
 import { LegacySoundManager } from 'systems-host/systems/LegacySoundManager';
 import { LegacyTcasComputer } from 'systems-host/systems/tcas/components/LegacyTcasComputer';
 import { VhfRadio } from 'systems-host/systems/Communications/VhfRadio';
-import { FailuresConsumer, PilotSeatPublisher, VhfComIndices } from '@flybywiresim/fbw-sdk';
+import {
+  ArincEventBus,
+  BtvSimvarPublisher,
+  FailuresConsumer,
+  PilotSeatPublisher,
+  VhfComIndices,
+} from '@flybywiresim/fbw-sdk';
 import { AudioManagementUnit } from 'systems-host/systems/Communications/AudioManagementUnit';
 import { RmpAmuBusPublisher } from 'systems-host/systems/Communications/RmpAmuBusPublisher';
 import { Transponder } from 'systems-host/systems/Communications/Transponder';
@@ -28,9 +33,10 @@ import { SimAudioManager } from 'systems-host/systems/Communications/SimAudioMan
 import { AtsuSystem } from 'systems-host/systems/atsu';
 import { FwsCore } from 'systems-host/systems/FlightWarningSystem/FwsCore';
 import { FuelSystemPublisher } from 'systems-host/systems/FuelSystemPublisher';
+import { BrakeToVacateDistanceUpdater } from 'systems-host/systems/BrakeToVacateDistanceUpdater';
 
 class SystemsHost extends BaseInstrument {
-  private readonly bus = new EventBus();
+  private readonly bus = new ArincEventBus();
 
   private readonly sub = this.bus.getSubscriber<PowerSupplyBusTypes>();
 
@@ -77,15 +83,19 @@ class SystemsHost extends BaseInstrument {
 
   private readonly atsu = new AtsuSystem(this.bus);
 
+  private readonly btvDistanceUpdater = new BrakeToVacateDistanceUpdater(this.bus);
+
   private readonly rmpAmuBusPublisher = new RmpAmuBusPublisher(this.bus);
 
   private readonly pilotSeatPublisher = new PilotSeatPublisher(this.bus);
 
   private readonly powerPublisher = new PowerSupplyBusses(this.bus);
 
+  private readonly btvPublisher = new BtvSimvarPublisher(this.bus);
+
   private readonly weightAndBalancePublisher = new WeightBalanceSimvarPublisher(this.bus);
 
-  private readonly fuelssystemPublisher = new FuelSystemPublisher(this.bus);
+  private readonly fuelSystemPublisher = new FuelSystemPublisher(this.bus);
 
   private readonly fwsCore = new FwsCore(1, this.bus);
 
@@ -112,11 +122,13 @@ class SystemsHost extends BaseInstrument {
     this.backplane.addInstrument('SimAudioManager', this.simAudioManager);
     this.backplane.addInstrument('Xpndr1', this.xpdr1, true);
     this.backplane.addInstrument('AtsuSystem', this.atsu);
+    this.backplane.addInstrument('BtvDistanceUpdater', this.btvDistanceUpdater);
     this.backplane.addPublisher('RmpAmuBusPublisher', this.rmpAmuBusPublisher);
     this.backplane.addPublisher('PilotSeatPublisher', this.pilotSeatPublisher);
     this.backplane.addPublisher('PowerPublisher', this.powerPublisher);
+    this.backplane.addPublisher('BtvPublisher', this.btvPublisher);
     this.backplane.addPublisher('Weightpublisher', this.weightAndBalancePublisher);
-    this.backplane.addPublisher('FuelPublisher', this.fuelssystemPublisher);
+    this.backplane.addPublisher('FuelPublisher', this.fuelSystemPublisher);
     this.backplane.addInstrument('LegacyFuel', this.legacyFuel);
 
     this.hEventPublisher = new HEventPublisher(this.bus);
diff --git a/fbw-a380x/src/systems/systems-host/systems/BrakeToVacateDistanceUpdater.ts b/fbw-a380x/src/systems/systems-host/systems/BrakeToVacateDistanceUpdater.ts
new file mode 100644
index 00000000000..8feea1c24d1
--- /dev/null
+++ b/fbw-a380x/src/systems/systems-host/systems/BrakeToVacateDistanceUpdater.ts
@@ -0,0 +1,205 @@
+// Copyright (c) 2023-2024 FlyByWire Simulations
+// SPDX-License-Identifier: GPL-3.0
+
+import { ConsumerSubject, EventBus, Instrument, MappedSubject, Subject } from '@microsoft/msfs-sdk';
+import { Arinc429LocalVarConsumerSubject, BtvData, FmsOansData } from '@flybywiresim/fbw-sdk';
+import {
+  FmsDataStore,
+  globalToAirportCoordinates,
+  MIN_TOUCHDOWN_ZONE_DISTANCE,
+  pointDistance,
+} from '@flybywiresim/oanc';
+import { Arinc429Register, Arinc429SignStatusMatrix, MathUtils } from '@flybywiresim/fbw-sdk';
+import { NavigationDatabase, NavigationDatabaseBackend, NavigationDatabaseService } from '@fmgc/index';
+import { placeBearingDistance } from 'msfs-geo';
+import { Position } from '@turf/turf';
+
+/**
+ * Utility class for brake to vacate (BTV) functions on the A380
+ */
+
+export class BrakeToVacateDistanceUpdater implements Instrument {
+  private readonly sub = this.bus.getSubscriber<BtvData & FmsOansData>();
+
+  private readonly fmsDataStore = new FmsDataStore(this.bus);
+
+  private readonly airportLocalPos = ConsumerSubject.create(this.sub.on('oansAirportLocalCoordinates'), []);
+
+  private readonly remainingDistToExitArinc = Arinc429Register.empty();
+
+  private readonly remaininingDistToRwyEndArinc = Arinc429Register.empty();
+
+  private readonly requestedStoppingDistArinc = Arinc429Register.empty();
+
+  constructor(private readonly bus: EventBus) {
+    this.remainingDistToExit.sub((v) => {
+      this.remainingDistToExitArinc.setValue(v < 0 ? 0 : v);
+      this.remainingDistToExitArinc.setSsm(
+        v < 0 ? Arinc429SignStatusMatrix.NoComputedData : Arinc429SignStatusMatrix.NormalOperation,
+      );
+      this.remainingDistToExitArinc.writeToSimVar('L:A32NX_OANS_BTV_REMAINING_DIST_TO_EXIT');
+    });
+
+    this.remaininingDistToRwyEnd.sub((v) => {
+      this.remaininingDistToRwyEndArinc.setValue(v < 0 ? 0 : v);
+      this.remaininingDistToRwyEndArinc.setSsm(
+        v < 0 ? Arinc429SignStatusMatrix.NoComputedData : Arinc429SignStatusMatrix.NormalOperation,
+      );
+      this.remaininingDistToRwyEndArinc.writeToSimVar('L:A32NX_OANS_BTV_REMAINING_DIST_TO_RWY_END');
+    });
+
+    this.thresholdPositions.sub((tPos) => {
+      if (tPos.length > 0) {
+        const lda = pointDistance(tPos[0][0], tPos[0][1], tPos[1][0], tPos[1][1]);
+        this.remaininingDistToRwyEnd.set(lda - MIN_TOUCHDOWN_ZONE_DISTANCE);
+        this.remainingDistToExit.set(lda - MIN_TOUCHDOWN_ZONE_DISTANCE);
+      }
+    }, true);
+
+    this.exitPosition.sub((ePos) => {
+      const tPos = this.thresholdPositions.get()[0];
+      if (tPos && ePos) {
+        const exitDistance = pointDistance(tPos[0], tPos[1], ePos[0], ePos[1]) - MIN_TOUCHDOWN_ZONE_DISTANCE;
+        this.requestedStoppingDistArinc.setValue(exitDistance);
+        this.requestedStoppingDistArinc.setSsm(Arinc429SignStatusMatrix.NormalOperation);
+        this.requestedStoppingDistArinc.writeToSimVar('L:A32NX_OANS_BTV_REQ_STOPPING_DISTANCE');
+      }
+    }, true);
+
+    // If BTV runway not set when passing 300ft, set from FMS. Needed for ROW/ROP
+    // FIXME Predict landing runway separately for ROP/ROW
+    this.below300ftRaAndLanding.sub((below300) => {
+      if (below300 && !this.runwayIsSet()) {
+        this.setBtvRunwayFromFmsRunway();
+      }
+    });
+  }
+
+  init() {
+    const db = new NavigationDatabase(NavigationDatabaseBackend.Msfs);
+    NavigationDatabaseService.activeDatabase = db;
+
+    this.clearSelection();
+  }
+
+  /** Updated during deceleration on the ground. Counted from touchdown distance (min. 400m).  */
+  private readonly remainingDistToExit = Subject.create<number>(0);
+
+  /** Updated during deceleration on the ground. Counted from touchdown distance (min. 400m).  */
+  private readonly remaininingDistToRwyEnd = Subject.create<number>(0);
+
+  private readonly thresholdPositions = ConsumerSubject.create(this.sub.on('oansThresholdPositions'), []);
+
+  private readonly exitPosition = ConsumerSubject.create(this.sub.on('oansExitPosition'), []);
+
+  private readonly radioAltitude1 = Arinc429LocalVarConsumerSubject.create(this.sub.on('radioAltitude_1'));
+  private readonly radioAltitude2 = Arinc429LocalVarConsumerSubject.create(this.sub.on('radioAltitude_2'));
+  private readonly radioAltitude3 = Arinc429LocalVarConsumerSubject.create(this.sub.on('radioAltitude_3'));
+
+  private readonly verticalSpeed1 = Arinc429LocalVarConsumerSubject.create(this.sub.on('verticalSpeed_1'));
+  private readonly verticalSpeed2 = Arinc429LocalVarConsumerSubject.create(this.sub.on('verticalSpeed_2'));
+  private readonly verticalSpeed3 = Arinc429LocalVarConsumerSubject.create(this.sub.on('verticalSpeed_3'));
+
+  private readonly fwsFlightPhase = ConsumerSubject.create(this.sub.on('fwcFlightPhase'), 0);
+
+  public readonly below300ftRaAndLanding = MappedSubject.create(
+    ([ra1, ra2, ra3, fp]) =>
+      fp > 8 && fp < 11 && (ra1.valueOr(2500) <= 300 || ra2.valueOr(2500) <= 300 || ra3.valueOr(2500) <= 300),
+    this.radioAltitude1,
+    this.radioAltitude2,
+    this.radioAltitude3,
+    this.fwsFlightPhase,
+  );
+
+  private runwayIsSet() {
+    const thresPos = this.thresholdPositions.get();
+    return thresPos.length >= 2 && thresPos[0].length > 0 && thresPos[1].length > 0;
+  }
+
+  private async setBtvRunwayFromFmsRunway() {
+    const destination = this.fmsDataStore.destination.get();
+    const rwyIdent = this.fmsDataStore.landingRunway.get();
+    if (destination && rwyIdent) {
+      const db = NavigationDatabaseService.activeDatabase.backendDatabase;
+
+      const arps = await db.getAirports([destination]);
+      const arpCoordinates = arps[0].location;
+
+      const runways = await db.getRunways(destination);
+      const landingRunwayNavdata = runways.filter((rw) => rw.ident === rwyIdent)[0];
+      const oppositeThreshold = placeBearingDistance(
+        landingRunwayNavdata.thresholdLocation,
+        landingRunwayNavdata.bearing,
+        landingRunwayNavdata.length / MathUtils.METRES_TO_NAUTICAL_MILES,
+      );
+      const localThr: Position = [0, 0];
+      const localOppThr: Position = [0, 0];
+      globalToAirportCoordinates(arpCoordinates, landingRunwayNavdata.thresholdLocation, localThr);
+      globalToAirportCoordinates(arpCoordinates, oppositeThreshold, localOppThr);
+
+      this.bus.getPublisher<FmsOansData>().pub('oansThresholdPositions', [localThr, localOppThr]);
+    }
+  }
+
+  private clearSelection() {
+    this.remainingDistToExit.set(-1);
+    this.remaininingDistToRwyEnd.set(-1);
+  }
+
+  private updateRemainingDistances() {
+    // Only update below 600ft AGL, and in landing FMGC phase
+    // Also, V/S should be below +400ft/min, to avoid ROW during G/A
+    if (
+      !(
+        this.radioAltitude1.get().valueOr(2500) < 600 ||
+        this.radioAltitude2.get().valueOr(2500) < 600 ||
+        this.radioAltitude3.get().valueOr(2500) < 600
+      ) ||
+      this.fwsFlightPhase.get() < 9 ||
+      this.fwsFlightPhase.get() > 11 ||
+      this.verticalSpeed1.get().valueOr(0) > 400 ||
+      this.verticalSpeed2.get().valueOr(0) > 400 ||
+      this.verticalSpeed3.get().valueOr(0) > 400
+    ) {
+      this.remaininingDistToRwyEnd.set(-1);
+      this.remainingDistToExit.set(-1);
+      return;
+    }
+
+    const thresholdPos = this.thresholdPositions.get()[0];
+    const oppositeThresholdPos = this.thresholdPositions.get()[1];
+    const airportLocalPos = this.airportLocalPos.get();
+
+    if (thresholdPos && thresholdPos.length > 0) {
+      if (oppositeThresholdPos && oppositeThresholdPos.length > 0) {
+        const rwyEndDistanceFromTdz =
+          pointDistance(thresholdPos[0], thresholdPos[1], oppositeThresholdPos[0], oppositeThresholdPos[1]) -
+          MIN_TOUCHDOWN_ZONE_DISTANCE;
+
+        const rwyEndDistance = pointDistance(
+          airportLocalPos[0],
+          airportLocalPos[1],
+          oppositeThresholdPos[0],
+          oppositeThresholdPos[1],
+        );
+
+        this.remaininingDistToRwyEnd.set(MathUtils.round(Math.min(rwyEndDistanceFromTdz, rwyEndDistance), 0.1));
+      }
+
+      const exitPos = this.exitPosition.get();
+
+      if (exitPos && exitPos.length > 0) {
+        const exitDistanceFromTdz =
+          pointDistance(thresholdPos[0], thresholdPos[1], exitPos[0], exitPos[1]) - MIN_TOUCHDOWN_ZONE_DISTANCE;
+
+        const exitDistance = pointDistance(airportLocalPos[0], airportLocalPos[1], exitPos[0], exitPos[1]);
+
+        this.remainingDistToExit.set(MathUtils.round(Math.min(exitDistanceFromTdz, exitDistance), 0.1));
+      }
+    }
+  }
+
+  public onUpdate(): void {
+    this.updateRemainingDistances();
+  }
+}
diff --git a/fbw-a380x/src/systems/systems-host/systems/FlightWarningSystem/FwsCore.ts b/fbw-a380x/src/systems/systems-host/systems/FlightWarningSystem/FwsCore.ts
index 832cdd92f1b..bd3b186de71 100644
--- a/fbw-a380x/src/systems/systems-host/systems/FlightWarningSystem/FwsCore.ts
+++ b/fbw-a380x/src/systems/systems-host/systems/FlightWarningSystem/FwsCore.ts
@@ -1054,6 +1054,11 @@ export class FwsCore {
 
   public readonly flightPhaseInhibitOverrideNode = new NXLogicMemoryNode(false);
 
+  /** If one of the ADR's CAS is above V1 - 4kts, confirm for 0.3s */
+  public readonly v1SpeedConfirmNode = new NXLogicConfirmNode(0.3);
+
+  public readonly v1CalloutOutput = Subject.create(false);
+
   /* LANDING GEAR AND LIGHTS */
 
   public readonly aircraftOnGround = Subject.create(false);
@@ -1570,6 +1575,8 @@ export class FwsCore {
       SimVar.SetSimVarValue('L:A32NX_FWS_AUDIO_VOLUME', SimVarValueType.Enum, volume);
     }, true);
 
+    this.v1CalloutOutput.sub((c) => SimVar.SetSimVarValue('L:A32NX_AUDIO_V1_CALLOUT', SimVarValueType.Bool, c), true);
+
     // L/G lever red arrow sinking outputs
     this.lgLeverRedArrow.sub((on) => {
       // TODO FWCs need to be powered...
@@ -2284,6 +2291,18 @@ export class FwsCore {
 
     this.trueNorthRef.set(SimVar.GetSimVarValue('L:A32NX_PUSH_TRUE_REF', 'number'));
 
+    /* V1 callout */
+    const v1 = SimVar.GetSimVarValue('L:AIRLINER_V1_SPEED', SimVarValueType.Knots);
+    const v1Threshold = v1 - 4;
+    this.v1SpeedConfirmNode.write(
+      v1 &&
+        (this.adr1Cas.get().valueOr(0) > v1Threshold ||
+          this.adr2Cas.get().valueOr(0) > v1Threshold ||
+          this.adr3Cas.get().valueOr(0) > v1Threshold),
+      deltaTime,
+    );
+    this.v1CalloutOutput.set(this.fwcFlightPhase.get() === 4 && this.v1SpeedConfirmNode.read());
+
     /* LANDING GEAR AND LIGHTS acquisition */
 
     this.antiSkidSwitchOff.set(!SimVar.GetSimVarValue('ANTISKID BRAKES ACTIVE', 'bool'));
diff --git a/fbw-a380x/src/systems/systems-host/tsconfig.json b/fbw-a380x/src/systems/systems-host/tsconfig.json
index f909a1bc5e0..7a6e09800b3 100644
--- a/fbw-a380x/src/systems/systems-host/tsconfig.json
+++ b/fbw-a380x/src/systems/systems-host/tsconfig.json
@@ -16,6 +16,7 @@
         "@tcas/*": ["./tcas/src/*"],
         "@typings/*": ["../../../fbw-common/src/typings/*"],
         "@flybywiresim/fbw-sdk": ["../../../fbw-common/src/systems/index-no-react.ts"],
+        "@flybywiresim/oanc": ["../../../fbw-common/src/systems/instruments/src/OANC/index.ts"],
         "@flybywiresim/rmp": ["../../../fbw-common/src/systems/instruments/src/RMP/index.ts"],
       }
     }
diff --git a/fbw-a380x/src/wasm/fadec_a380x/src/Fadec/FuelConfiguration_A380X.h b/fbw-a380x/src/wasm/fadec_a380x/src/Fadec/FuelConfiguration_A380X.h
index 89477379a6f..541bee74b7f 100644
--- a/fbw-a380x/src/wasm/fadec_a380x/src/Fadec/FuelConfiguration_A380X.h
+++ b/fbw-a380x/src/wasm/fadec_a380x/src/Fadec/FuelConfiguration_A380X.h
@@ -28,19 +28,19 @@
  */
 class FuelConfiguration_A380X {
   // Fuel tank default quantities in gallons
-  static constexpr double fuelFeedOneDefault = 1082.0;                // tank 2
+  static constexpr double fuelFeedOneDefault = 1233.9;                // tank 2
   static constexpr double fuelFeedTwoDefault = fuelFeedOneDefault;    // tank 5
   static constexpr double fuelFeedThreeDefault = fuelFeedOneDefault;  // tank 6
   static constexpr double fuelFeedFourDefault = fuelFeedOneDefault;   // tank 9
 
-  static constexpr double fuelLeftOuterDefault = 2731.0;                 // tank 1
-  static constexpr double fuelRightOuterDefault = fuelLeftOuterDefault;  // tank 10
-  static constexpr double fuelLeftMidDefault = 9630.0;                   // tank 3
-  static constexpr double fuelRightMidDefault = fuelLeftMidDefault;      // tank 8
-  static constexpr double fuelLeftInnerDefault = 12187.0;                // tank 4
-  static constexpr double fuelRightInnerDefault = fuelLeftInnerDefault;  // tank 7
+  static constexpr double fuelLeftOuterDefault = 0;                        // tank 1
+  static constexpr double fuelRightOuterDefault = fuelLeftOuterDefault;    // tank 10
+  static constexpr double fuelLeftMidDefault = 0;                          // tank 3
+  static constexpr double fuelRightMidDefault = fuelLeftMidDefault;        // tank 8
+  static constexpr double fuelLeftInnerDefault = 0;                        // tank 4
+  static constexpr double fuelRightInnerDefault = fuelLeftInnerDefault;    // tank 7
 
-  static constexpr double fuelTrimDefault = 6259.0;  // tank 11
+  static constexpr double fuelTrimDefault = 0;  // tank 11
 
  private:
   // Actual fuel tank quantities in gallons
diff --git a/fbw-a380x/src/wasm/fbw_a380/src/interface/SimConnectData.h b/fbw-a380x/src/wasm/fbw_a380/src/interface/SimConnectData.h
index bbcdd37cd80..0648e79b65e 100644
--- a/fbw-a380x/src/wasm/fbw_a380/src/interface/SimConnectData.h
+++ b/fbw-a380x/src/wasm/fbw_a380/src/interface/SimConnectData.h
@@ -161,6 +161,7 @@ struct SimInputAutopilot {
   double HDG_pull;
   double ALT_push;
   double ALT_pull;
+  // FIXME remove VS_push
   double VS_push;
   double VS_pull;
   double LOC_push;
diff --git a/fbw-a380x/src/wasm/fbw_a380/src/interface/SimConnectInterface.cpp b/fbw-a380x/src/wasm/fbw_a380/src/interface/SimConnectInterface.cpp
index 9cfa56df610..61066f13f5b 100644
--- a/fbw-a380x/src/wasm/fbw_a380/src/interface/SimConnectInterface.cpp
+++ b/fbw-a380x/src/wasm/fbw_a380/src/interface/SimConnectInterface.cpp
@@ -653,7 +653,6 @@ bool SimConnectInterface::prepareSimInputSimConnectDataDefinitions() {
   result &= addInputDataDefinition(hSimConnect, 0, Events::A32NX_FCU_VS_SET, "A32NX.FCU_VS_SET", false);
   result &= addInputDataDefinition(hSimConnect, 0, Events::A32NX_FCU_VS_PUSH, "A32NX.FCU_VS_PUSH", false);
   result &= addInputDataDefinition(hSimConnect, 0, Events::A32NX_FCU_VS_PULL, "A32NX.FCU_VS_PULL", false);
-  result &= addInputDataDefinition(hSimConnect, 0, Events::A32NX_FCU_TO_AP_VS_PUSH, "A32NX.FCU_TO_AP_VS_PUSH", false);
   result &= addInputDataDefinition(hSimConnect, 0, Events::A32NX_FCU_TO_AP_VS_PULL, "A32NX.FCU_TO_AP_VS_PULL", false);
   result &= addInputDataDefinition(hSimConnect, 0, Events::A32NX_FCU_LOC_PUSH, "A32NX.FCU_LOC_PUSH", false);
   result &= addInputDataDefinition(hSimConnect, 0, Events::A32NX_FCU_APPR_PUSH, "A32NX.FCU_APPR_PUSH", false);
@@ -2490,11 +2489,6 @@ void SimConnectInterface::processEventWithOneParam(const DWORD eventId, const DW
       break;
     }
 
-    case Events::A32NX_FCU_TO_AP_VS_PUSH: {
-      simInputAutopilot.VS_push = 1;
-      std::cout << "WASM: event triggered: A32NX_FCU_TO_AP_VS_PUSH" << std::endl;
-      break;
-    }
     case Events::A32NX_FCU_TO_AP_VS_PULL: {
       simInputAutopilot.VS_pull = 1;
       std::cout << "WASM: event triggered: A32NX_FCU_TO_AP_VS_PULL" << std::endl;
diff --git a/fbw-a380x/src/wasm/fbw_a380/src/interface/SimConnectInterface.h b/fbw-a380x/src/wasm/fbw_a380/src/interface/SimConnectInterface.h
index 1c691fc69d9..a97dd8195f0 100644
--- a/fbw-a380x/src/wasm/fbw_a380/src/interface/SimConnectInterface.h
+++ b/fbw-a380x/src/wasm/fbw_a380/src/interface/SimConnectInterface.h
@@ -79,7 +79,6 @@ class SimConnectInterface {
     A32NX_FCU_VS_SET,
     A32NX_FCU_VS_PUSH,
     A32NX_FCU_VS_PULL,
-    A32NX_FCU_TO_AP_VS_PUSH,
     A32NX_FCU_TO_AP_VS_PULL,
     A32NX_FCU_LOC_PUSH,
     A32NX_FCU_APPR_PUSH,
diff --git a/fbw-a380x/src/wasm/systems/a380_systems/src/structural_flex.rs b/fbw-a380x/src/wasm/systems/a380_systems/src/structural_flex.rs
index 6d0efb0c642..f48934141c7 100644
--- a/fbw-a380x/src/wasm/systems/a380_systems/src/structural_flex.rs
+++ b/fbw-a380x/src/wasm/systems/a380_systems/src/structural_flex.rs
@@ -402,8 +402,8 @@ pub struct WingFlexA380 {
 }
 impl WingFlexA380 {
     const FLEX_COEFFICIENTS: [f64; WING_FLEX_LINK_NUMBER] =
-        [20000000., 8000000., 5000000., 500000.];
-    const DAMPING_COEFFICIENTS: [f64; WING_FLEX_LINK_NUMBER] = [800000., 400000., 150000., 6000.];
+        [16000000., 6000000., 3500000., 200000.];
+    const DAMPING_COEFFICIENTS: [f64; WING_FLEX_LINK_NUMBER] = [800000., 500000., 150000., 5000.];
 
     const EMPTY_MASS_KG: [f64; WING_FLEX_NODE_NUMBER] = [0., 25000., 20000., 5000., 400.];
 
@@ -1438,9 +1438,10 @@ mod tests {
         );
     }
 
-    // Check that provided following XML formula, final animation value matches expected values
+    // Utility to run to check that provided following XML formula, final animation value matches expected values
     // Need to set XML code according to those formulas
     #[test]
+    #[ignore]
     fn util_to_compute_xml_offsets_from_desired_angles_in_flight() {
         let mut test_bed = WingFlexTestBed::new().with_nominal_weight().in_1g_flight();
 
diff --git a/fbw-a380x/src/wasm/systems/a380_systems_wasm/src/spoilers.rs b/fbw-a380x/src/wasm/systems/a380_systems_wasm/src/spoilers.rs
index 6ac9bf31863..f76ac2b2e0c 100644
--- a/fbw-a380x/src/wasm/systems/a380_systems_wasm/src/spoilers.rs
+++ b/fbw-a380x/src/wasm/systems/a380_systems_wasm/src/spoilers.rs
@@ -35,5 +35,111 @@ pub(super) fn spoilers(builder: &mut MsfsAspectBuilder) -> Result<(), Box<dyn Er
         Variable::named("HYD_SPOILERS_RIGHT_DEFLECTION"),
     );
 
+    // FIX ME: Remove this section once spoiler animation is back to linear in the model
+    builder.map(
+        ExecuteOn::PostTick,
+        Variable::named("HYD_SPOILER_1_LEFT_DEFLECTION"),
+        unsmooth_spoiler_animation,
+        Variable::named("HYD_SPOILER_1_LEFT_DEFLECTION_UNSMOOTH"),
+    );
+    builder.map(
+        ExecuteOn::PostTick,
+        Variable::named("HYD_SPOILER_2_LEFT_DEFLECTION"),
+        unsmooth_spoiler_animation,
+        Variable::named("HYD_SPOILER_2_LEFT_DEFLECTION_UNSMOOTH"),
+    );
+    builder.map(
+        ExecuteOn::PostTick,
+        Variable::named("HYD_SPOILER_3_LEFT_DEFLECTION"),
+        unsmooth_spoiler_animation,
+        Variable::named("HYD_SPOILER_3_LEFT_DEFLECTION_UNSMOOTH"),
+    );
+    builder.map(
+        ExecuteOn::PostTick,
+        Variable::named("HYD_SPOILER_4_LEFT_DEFLECTION"),
+        unsmooth_spoiler_animation,
+        Variable::named("HYD_SPOILER_4_LEFT_DEFLECTION_UNSMOOTH"),
+    );
+    builder.map(
+        ExecuteOn::PostTick,
+        Variable::named("HYD_SPOILER_5_LEFT_DEFLECTION"),
+        unsmooth_spoiler_animation,
+        Variable::named("HYD_SPOILER_5_LEFT_DEFLECTION_UNSMOOTH"),
+    );
+    builder.map(
+        ExecuteOn::PostTick,
+        Variable::named("HYD_SPOILER_6_LEFT_DEFLECTION"),
+        unsmooth_spoiler_animation,
+        Variable::named("HYD_SPOILER_6_LEFT_DEFLECTION_UNSMOOTH"),
+    );
+    builder.map(
+        ExecuteOn::PostTick,
+        Variable::named("HYD_SPOILER_7_LEFT_DEFLECTION"),
+        unsmooth_spoiler_animation,
+        Variable::named("HYD_SPOILER_7_LEFT_DEFLECTION_UNSMOOTH"),
+    );
+    builder.map(
+        ExecuteOn::PostTick,
+        Variable::named("HYD_SPOILER_8_LEFT_DEFLECTION"),
+        unsmooth_spoiler_animation,
+        Variable::named("HYD_SPOILER_8_LEFT_DEFLECTION_UNSMOOTH"),
+    );
+
+    builder.map(
+        ExecuteOn::PostTick,
+        Variable::named("HYD_SPOILER_1_RIGHT_DEFLECTION"),
+        unsmooth_spoiler_animation,
+        Variable::named("HYD_SPOILER_1_RIGHT_DEFLECTION_UNSMOOTH"),
+    );
+    builder.map(
+        ExecuteOn::PostTick,
+        Variable::named("HYD_SPOILER_2_RIGHT_DEFLECTION"),
+        unsmooth_spoiler_animation,
+        Variable::named("HYD_SPOILER_2_RIGHT_DEFLECTION_UNSMOOTH"),
+    );
+    builder.map(
+        ExecuteOn::PostTick,
+        Variable::named("HYD_SPOILER_3_RIGHT_DEFLECTION"),
+        unsmooth_spoiler_animation,
+        Variable::named("HYD_SPOILER_3_RIGHT_DEFLECTION_UNSMOOTH"),
+    );
+    builder.map(
+        ExecuteOn::PostTick,
+        Variable::named("HYD_SPOILER_4_RIGHT_DEFLECTION"),
+        unsmooth_spoiler_animation,
+        Variable::named("HYD_SPOILER_4_RIGHT_DEFLECTION_UNSMOOTH"),
+    );
+    builder.map(
+        ExecuteOn::PostTick,
+        Variable::named("HYD_SPOILER_5_RIGHT_DEFLECTION"),
+        unsmooth_spoiler_animation,
+        Variable::named("HYD_SPOILER_5_RIGHT_DEFLECTION_UNSMOOTH"),
+    );
+    builder.map(
+        ExecuteOn::PostTick,
+        Variable::named("HYD_SPOILER_6_RIGHT_DEFLECTION"),
+        unsmooth_spoiler_animation,
+        Variable::named("HYD_SPOILER_6_RIGHT_DEFLECTION_UNSMOOTH"),
+    );
+    builder.map(
+        ExecuteOn::PostTick,
+        Variable::named("HYD_SPOILER_7_RIGHT_DEFLECTION"),
+        unsmooth_spoiler_animation,
+        Variable::named("HYD_SPOILER_7_RIGHT_DEFLECTION_UNSMOOTH"),
+    );
+    builder.map(
+        ExecuteOn::PostTick,
+        Variable::named("HYD_SPOILER_8_RIGHT_DEFLECTION"),
+        unsmooth_spoiler_animation,
+        Variable::named("HYD_SPOILER_8_RIGHT_DEFLECTION_UNSMOOTH"),
+    );
+
     Ok(())
 }
+
+// TODO This is a quick fix: Remove once spoiler animation is back to fully linear
+fn unsmooth_spoiler_animation(raw_value: f64) -> f64 {
+    let gain = (1. / (1.7 * (raw_value + 0.2))).clamp(1., 3.);
+
+    raw_value * gain
+}
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/ar.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/ar.json
index 75d2e6d8cce..e775a5a323b 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/ar.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/ar.json
@@ -567,6 +567,8 @@
     },
     "Title": "Quick Controls"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "حول"
@@ -740,6 +742,7 @@
       "Blue": "أزرق",
       "Brightness": "السطوع",
       "Dark": "داكن",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "اللغة",
       "Light": "فاتح",
       "Local": "محلي",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "التوقيت المحلي و العالمي"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "الاقتراب ",
     "Aug": "أغسطس",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/cs.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/cs.json
index 9f54549fd68..9f711812c11 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/cs.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/cs.json
@@ -193,7 +193,7 @@
       "Title": "Vytlačení"
     },
     "Services": {
-      "AirStarterUnit": "Vzduchová startovací jednotka",
+      "AirStarterUnit": "Vzduchová start. jedn.",
       "BaggageTruck": "Zavazadlový vůz",
       "CateringTruck": "Cateringový vůz",
       "Cones": "Výstražné kužely",
@@ -305,7 +305,7 @@
       "OverweightProcedure": "Overweight postup",
       "Qnh": "QNH",
       "ReverseThrust": "Zpětný tah",
-      "RunwayAltitude": "Výška dráhy",
+      "RunwayAltitude": "Nadmořská výška dráhy",
       "RunwayAltitudeUnit": "ft ASL (stopy nad mořem)",
       "RunwayCondition": "Stav dráhy",
       "RunwayConditions": {
@@ -338,74 +338,74 @@
     },
     "SYNC": "SYNC",
     "Takeoff": {
-      "Airport": "Airport",
+      "Airport": "Letiště",
       "AntiIce": "Anti-Ice",
-      "Calculate": "Calculate",
+      "Calculate": "Vypočítat",
       "CentreOfGravity": "TOCG",
-      "Clear": "Clear",
-      "CoGPosition": "CG Position",
+      "Clear": "Vymazat",
+      "CoGPosition": "Poloha CG",
       "CoGPositions": {
-        "Forward": "Forward (<27%)",
-        "Standard": "Standard"
+        "Forward": "Vpředu (<27%)",
+        "Standard": "Standardní"
       },
-      "Configuration": "Configuration",
-      "CrosswindAboveLimitMessage": "Do you want to perform the computation with {actual_crosswind} knots?",
-      "CrosswindAboveLimitTitle": "Maximum Crosswind Is {max_crosswind} Knots",
-      "EnterManually": "Enter Manually",
-      "EntryAngle": "Entry Angle",
+      "Configuration": "Konfigurace",
+      "CrosswindAboveLimitMessage": "Chcete provést výpočet s {actual_crosswind} uzly?",
+      "CrosswindAboveLimitTitle": "Maximální boční vítr je {max_crosswind} uzlů",
+      "EnterManually": "Ruční vyplnění",
+      "EntryAngle": "Vstupní úhel",
       "EntryAngles": {
         "0": "0°",
         "90": "90°",
         "180": "180°"
       },
       "Messages": {
-        "CgOutOfLimits": "CG Outside Takeoff Envelope",
-        "FlexNotPossible": "Flex Not Possible",
-        "HeadwindLimited": "Headwind has been reduced to {max_headwind} knots",
-        "InvalidData": "Invalid Inputs",
-        "MaximumPressureAlt": "Above Maximum Pressure Altitude ({max_zp} ft)",
-        "MaximumRunwaySlope": "Beyond Runway Slope Limits (±2%)",
-        "MaximumTailwind": "Above Maximum Tailwind ({max_tailwind} knots)",
-        "MaximumTemperature": "Above Maximum OAT ({tmax}°C)",
-        "MaximumTireSpeed": "Maximum Tire Speed Not Satisfied",
-        "OperatingEmptyWeight": "Below Operating Empty Weight ({oew} {weight_unit})",
-        "StructuralMtow": "Above Structural MTOW ({structural_mtow} {weight_unit})",
-        "TooHeavy": "Beyond Takeoff Weight Limit - Max {mtow} {weight_unit}",
-        "TooLight": "Below Minimum Takeoff Weight",
-        "VmcgVmcaLimits": "VMCG/VMCA Limits Not Satisfied"
+        "CgOutOfLimits": "CG mimo vzletový limit",
+        "FlexNotPossible": "Flex není možný",
+        "HeadwindLimited": "Protivítr byl snížen na {max_headwind} uzlů",
+        "InvalidData": "Neplatné údaje",
+        "MaximumPressureAlt": "Nad maximální tlakovou výškou ({max_zp} ft)",
+        "MaximumRunwaySlope": "Mimo limit sklonu dráhy (±2%)",
+        "MaximumTailwind": "Nad maximální hodnotou zadního větru ({max_tailwind} uzlů)",
+        "MaximumTemperature": "Nad maximální OAT ({tmax}°C)",
+        "MaximumTireSpeed": "Maximální rychlost pneumatik není dodržena",
+        "OperatingEmptyWeight": "Pod prázdnou provozní hmotností ({oew} {weight_unit})",
+        "StructuralMtow": "Nad konstrukční MTOW ({structural_mtow} {weight_unit})",
+        "TooHeavy": "Přes maximální vzletovou hmotnost {mtow} {weight_unit}",
+        "TooLight": "Pod minimální vzletovou hmotností",
+        "VmcgVmcaLimits": "Limity VMCG/VMCA nejsou splněny"
       },
-      "Packs": "Packs",
+      "Packs": "Packy",
       "Qnh": "QNH",
-      "Runway": "Runway",
-      "RunwayBearing": "Runway Bearing",
+      "Runway": "Dráha",
+      "RunwayBearing": "Směr dráhy",
       "RunwayBearingUnit": "°",
-      "RunwayCondition": "Runway Condition",
+      "RunwayCondition": "Stav dráhy",
       "RunwayConditions": {
-        "Contaminated100mmDrySnow": "Dry Snow - 100 mm/4\"",
-        "Contaminated10mmDrySnow": "Dry Snow - 10 mm/⅖\"",
-        "Contaminated13mmSlush": "Slush - 12.7 mm/½\"",
-        "Contaminated13mmWater": "Water - 12.7 mm/½\"",
-        "Contaminated15mmWetSnow": "Wet Snow - 15 mm/⅗\"",
-        "Contaminated30mmWetSnow": "Wet Snow - 30 mm/⅗\"",
-        "Contaminated5mmWetSnow": "Wet Snow - 5 mm/⅕\"",
-        "Contaminated6mmSlush": "Slush - 6.3 mm/¼\"",
-        "Contaminated6mmWater": "Water - 6.3 mm/¼\"",
-        "ContaminatedCompactedSnow": "Compacted Snow",
-        "Dry": "Dry",
-        "Wet": "Wet"
+        "Contaminated100mmDrySnow": "Suchý sníh - 100 mm/4\"",
+        "Contaminated10mmDrySnow": "Suchý sníh - 10 mm/⅖\"",
+        "Contaminated13mmSlush": "Břečka - 12,7 mm/½\"",
+        "Contaminated13mmWater": "Voda - 12,7 mm/½\"",
+        "Contaminated15mmWetSnow": "Mokrý sníh - 15 mm/⅗\"",
+        "Contaminated30mmWetSnow": "Mokrý sníh - 30 mm/⅗\"",
+        "Contaminated5mmWetSnow": "Mokrý sníh - 5 mm/⅕\"",
+        "Contaminated6mmSlush": "Břečka - 6,3 mm/¼\"",
+        "Contaminated6mmWater": "Voda - 6,3 mm/¼\"",
+        "ContaminatedCompactedSnow": "Uježděný sníh",
+        "Dry": "Suchý",
+        "Wet": "Mokrý"
       },
-      "RunwayElevation": "Runway Elevation",
+      "RunwayElevation": "Výška dráhy",
       "RunwayElevationUnit": "ft",
       "RunwayLengthUnitFt": "ft",
       "RunwayLengthUnitMeter": "m",
-      "RunwaySlope": "Runway Slope",
-      "Temperature": "Temperature",
-      "Thrust": "Thrust",
-      "Title": "Takeoff",
+      "RunwaySlope": "Sklon dráhy",
+      "Temperature": "Teplota",
+      "Thrust": "Výkon",
+      "Title": "Vzlet",
       "Tora": "TORA",
-      "Weight": "Takeoff Weight",
-      "Wind": "Wind",
-      "WindMagnitudeUnit": "kts or °/kts"
+      "Weight": "Vzletová hmotnost",
+      "Wind": "Vítr",
+      "WindMagnitudeUnit": "kts nebo °/kts"
     },
     "Title": "Výkony",
     "TopOfDescent": {
@@ -547,10 +547,10 @@
     "PauseAtTodInactive": "Neaktivní",
     "PauseAtTodStandby": "Připravena",
     "SimBridge": "SimBridge",
-    "SimBridgeConnected": "připojen",
+    "SimBridgeConnected": "Připojen",
     "SimBridgeConnecting": "Připojování…",
-    "SimBridgeOff": "vypnutý",
-    "SimBridgeOffline": "nedostupný",
+    "SimBridgeOff": "Vypnutý",
+    "SimBridgeOffline": "Nedostupný",
     "Simrate": "Rychlost simulace",
     "TT": {
       "AlignAdirs": "Okamžitě zarovnat ADIRS",
@@ -567,6 +567,8 @@
     },
     "Title": "Rychlé ovládání"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Zapnutí/vypnutí automatického osvětlení kabiny",
+  "QuickControls.TT.CabinLighting": "Nastavení osvětlení kabiny",
   "Settings": {
     "About": {
       "Title": "O zařízení"
@@ -632,7 +634,7 @@
       "AutofillChecklists": "Automaticky vyplňovat checklisty",
       "BoardingTime": "Čas nastupování cestujících",
       "DmcSelfTestTime": "Inicializační test DMC",
-      "EclSoftKeys": "Show Soft Keys for EWD Electronic Checklists",
+      "EclSoftKeys": "Zobrazit tlačítka pro elektronický checklist na EWD",
       "FirstOfficerAvatar": "Zobrazit avatar prvního důstojníka",
       "HomeCockpitMode": "Režim domácího kokpitu",
       "McduFocusTimeout": "Časový limit vstupu MCDU z klávesnice (sekundy)",
@@ -641,7 +643,7 @@
       "PauseAtTodDistance": "Vzdálenost zapauzování před T/D (nm)",
       "PilotAvatar": "Zobrazit avatar pilota",
       "SeparateTillerFromRudderInputs": "Oddělit vstupy pro tiller a směrovku",
-      "SyncEfis": "Synchronizovat EFIS mezi kapitánem a FO",
+      "SyncEfis": "Synchronizovat EFIS a ovládání zvuku mezi kapitánem a prvním důstojníkem",
       "Title": "Realismus"
     },
     "SimOptions": {
@@ -658,16 +660,16 @@
       "EnableSimBridge": "Povolit připojení SimBridge (Bez úspěšného připojení se po 5 minutách automaticky vypne)",
       "EnabledMcduServerConnectionAutoDeactivatesAfter5MinutesIfNoSuccessfulConnection": "Povolit připojení k serveru MCDU (Bez úspěšného připojení se po 5 minutách automaticky vypne)",
       "ExternalMcduServerPort": "Port externího serveru MCDU",
-      "FdrEnabled": "Enable Flight Data Recorder (FDR)",
+      "FdrEnabled": "Povolit zapisovač letových údajů (FDR)",
       "Hpa": "hPa",
       "Inactive": "Neaktivní",
-      "Left": "Left",
+      "Left": "Vlevo",
       "LoadOnly": "Pouze při načtení",
-      "None": "Žádné",
+      "None": "Nikdy",
       "Off": "Vypnuto",
-      "PilotSeat": "Pilot Seat for Control",
-      "Right": "Right",
-      "Save": "Uložit",
+      "PilotSeat": "Sedadlo pilota pro ovládání",
+      "Right": "Vpravo",
+      "Save": "Vždy",
       "Side": "Strana",
       "SimBridgeIp": "Externí hostitelská adresa SimBridge",
       "SimBridgePort": "Externí port SimBridge",
@@ -740,6 +742,7 @@
       "Blue": "Modrý",
       "Brightness": "Jas",
       "Dark": "Tmavý",
+      "DisablePushbackConflictWarning": "Vypnout varování o kompatibilitě Pushback systému",
       "Language": "Jazyk",
       "Light": "Světlý",
       "Local": "Místní",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC a místní"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Automatické osvětlení kabiny",
+  "Settings.SimOptions.CabinManualBrightness": "Jas osvětlení kabiny",
   "StatusBar": {
     "Apr": "Dub",
     "Aug": "Srp",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/da-DK.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/da-DK.json
index 86ce2c8bae8..0b38f711d22 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/da-DK.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/da-DK.json
@@ -567,6 +567,8 @@
     },
     "Title": "Quick Controls"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "Om"
@@ -740,6 +742,7 @@
       "Blue": "Blå",
       "Brightness": "Lysstyrke",
       "Dark": "Mørk",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Sprog",
       "Light": "Lys",
       "Local": "Lokal",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC og Lokal"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Apr",
     "Aug": "Aug",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/de.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/de.json
index 99be91bbc43..173c51b0fae 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/de.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/de.json
@@ -567,6 +567,8 @@
     },
     "Title": "Schnelleinstellungen"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "Über"
@@ -740,6 +742,7 @@
       "Blue": "Blau",
       "Brightness": "Helligkeit",
       "Dark": "Dunkel",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Sprache",
       "Light": "Hell",
       "Local": "Lokal",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC und Lokal"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Apr",
     "Aug": "Aug",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/el.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/el.json
index 8b30da81e75..828f3ec0d7f 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/el.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/el.json
@@ -567,6 +567,8 @@
     },
     "Title": "Γρήγοροι έλεγχοι"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "Σχετικά"
@@ -740,6 +742,7 @@
       "Blue": "Μπλέ",
       "Brightness": "Φωτεινότητα",
       "Dark": "Σκοτεινό",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Γλώσσα",
       "Light": "Φωτεινό",
       "Local": "Τοπική",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC και Τοπική"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Απρ",
     "Aug": "Αυγ",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/es.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/es.json
index d5e12470254..f94823435e5 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/es.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/es.json
@@ -567,6 +567,8 @@
     },
     "Title": "Controles rápidos"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "Acerca de"
@@ -740,6 +742,7 @@
       "Blue": "Azul",
       "Brightness": "Brillo",
       "Dark": "Oscuro",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Idioma",
       "Light": "Claro",
       "Local": "Local",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC y local"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Abr",
     "Aug": "Ago",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/eu.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/eu.json
index 35362e71329..e837cfeee4e 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/eu.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/eu.json
@@ -567,6 +567,8 @@
     },
     "Title": "Quick Controls"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "About"
@@ -740,6 +742,7 @@
       "Blue": "Blue",
       "Brightness": "Brightness",
       "Dark": "Dark",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Language",
       "Light": "Light",
       "Local": "Local",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC and Local"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Apr",
     "Aug": "Aug",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/fi.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/fi.json
index ed1cec02817..8c2be22ec43 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/fi.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/fi.json
@@ -567,6 +567,8 @@
     },
     "Title": "Pika-asetukset"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "Tietoja"
@@ -740,6 +742,7 @@
       "Blue": "Sininen",
       "Brightness": "Kirkkaus",
       "Dark": "Tumma",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Kieli",
       "Light": "Vaalea",
       "Local": "Paikallinen",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC ja paikallinen"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Huhti",
     "Aug": "Elo",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/fr.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/fr.json
index 9ec6b00b1b1..a241918bd26 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/fr.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/fr.json
@@ -567,6 +567,8 @@
     },
     "Title": "Commandes rapides"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "À propos"
@@ -740,6 +742,7 @@
       "Blue": "Bleu",
       "Brightness": "Luminosité",
       "Dark": "Sombre",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Langue",
       "Light": "Clair",
       "Local": "Locale",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC et local"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Avr",
     "Aug": "Août",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/he.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/he.json
index c7671d9b889..e39817ac583 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/he.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/he.json
@@ -567,6 +567,8 @@
     },
     "Title": "קיצורי דרך"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "אודות"
@@ -740,6 +742,7 @@
       "Blue": "כחול",
       "Brightness": "בהירות",
       "Dark": "כהה",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "שפה",
       "Light": "מואר",
       "Local": "מקומי",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC ומקומי"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "אפריל",
     "Aug": "אוגוסט",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/hi.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/hi.json
index e4fadfa0067..5ed3c6c0c40 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/hi.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/hi.json
@@ -567,6 +567,8 @@
     },
     "Title": "Quick Controls"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "बारे में"
@@ -740,6 +742,7 @@
       "Blue": "नीला",
       "Brightness": "ब्राइटनेस",
       "Dark": "डार्क",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "भाषा",
       "Light": "हल्का",
       "Local": "स्थानीय",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "यूटीसी और लोकल"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "अप्रैल",
     "Aug": "अगस्त",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/hr.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/hr.json
index 7f3cec5ed60..286bb90d36a 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/hr.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/hr.json
@@ -567,6 +567,8 @@
     },
     "Title": "Quick Controls"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "About"
@@ -740,6 +742,7 @@
       "Blue": "Blue",
       "Brightness": "Brightness",
       "Dark": "Dark",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Language",
       "Light": "Light",
       "Local": "Local",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC and Local"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Apr",
     "Aug": "Aug",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/hu.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/hu.json
index f21630647dc..6a01d23e9c3 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/hu.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/hu.json
@@ -567,6 +567,8 @@
     },
     "Title": "Gyors beállítások"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "Névjegy"
@@ -740,6 +742,7 @@
       "Blue": "Kék",
       "Brightness": "Fényerő",
       "Dark": "Sötét",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Nyelv",
       "Light": "Világos",
       "Local": "Helyi",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC és helyi"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Ápr.",
     "Aug": "Aug.",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/id.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/id.json
index ca01bdd62cd..0d774bbcfbd 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/id.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/id.json
@@ -567,6 +567,8 @@
     },
     "Title": "Kontrol Cepat"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "Tentang"
@@ -740,6 +742,7 @@
       "Blue": "Biru",
       "Brightness": "Kecerahan",
       "Dark": "Gelap",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Bahasa",
       "Light": "Terang",
       "Local": "Lokal",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC dan Lokal"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Apr",
     "Aug": "Agu",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/it.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/it.json
index 0d55c12d993..6ced3528ee7 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/it.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/it.json
@@ -567,6 +567,8 @@
     },
     "Title": "Controlli Rapidi"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "Informazioni"
@@ -740,6 +742,7 @@
       "Blue": "Blu",
       "Brightness": "Luminosità",
       "Dark": "Scuro",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Lingua",
       "Light": "Chiaro",
       "Local": "Locale",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC e Locale"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Apr",
     "Aug": "Ago",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/ja.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/ja.json
index 721503767c8..51ba7a4712f 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/ja.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/ja.json
@@ -567,6 +567,8 @@
     },
     "Title": "クイックコントロール"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "flyPadについて"
@@ -740,6 +742,7 @@
       "Blue": "ブルー",
       "Brightness": "明るさ",
       "Dark": "ダーク",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "言語",
       "Light": "ライト",
       "Local": "ローカル",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTCとローカル"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "4月",
     "Aug": "8月",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/ko.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/ko.json
index 4109c9ab24b..3b436336b79 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/ko.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/ko.json
@@ -567,6 +567,8 @@
     },
     "Title": "빠른 설정"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "정보"
@@ -740,6 +742,7 @@
       "Blue": "블루",
       "Brightness": "밝기",
       "Dark": "다크",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "언어",
       "Light": "라이트",
       "Local": "현지",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC 및 현지 시간"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "4월",
     "Aug": "8월",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/lt.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/lt.json
index dd2bbccb5a6..15791861dec 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/lt.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/lt.json
@@ -567,6 +567,8 @@
     },
     "Title": "Greiti valdikliai"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "Apie"
@@ -740,6 +742,7 @@
       "Blue": "Mėlyna",
       "Brightness": "Ryškumas",
       "Dark": "Tamsi",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Kalba",
       "Light": "Šviesi",
       "Local": "Vietinis",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC ir vietinis"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Bal",
     "Aug": "Rgp",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/ms.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/ms.json
index c2254b99596..c00571701b9 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/ms.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/ms.json
@@ -567,6 +567,8 @@
     },
     "Title": "Quick Controls"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "About"
@@ -740,6 +742,7 @@
       "Blue": "Blue",
       "Brightness": "Brightness",
       "Dark": "Dark",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Language",
       "Light": "Light",
       "Local": "Local",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC and Local"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Apr",
     "Aug": "Aug",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/nb.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/nb.json
index 8a01431d722..269c2e7cab1 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/nb.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/nb.json
@@ -567,6 +567,8 @@
     },
     "Title": "Hurtigkontroller"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "Om"
@@ -740,6 +742,7 @@
       "Blue": "Blå",
       "Brightness": "Lysstyrke",
       "Dark": "Mørk",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Språk",
       "Light": "Lys",
       "Local": "Lokal",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC og lokal"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "apr.",
     "Aug": "aug.",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/nl.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/nl.json
index b031c43e8b6..b79e8b459d6 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/nl.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/nl.json
@@ -567,6 +567,8 @@
     },
     "Title": "Quick Controls"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "Over"
@@ -740,6 +742,7 @@
       "Blue": "Blauw",
       "Brightness": "Helderheid",
       "Dark": "Donker",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Taal",
       "Light": "Licht",
       "Local": "Lokaal",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC en lokaal"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Apr.",
     "Aug": "Aug.",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/pl.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/pl.json
index 712b9c82288..a252b7dbac2 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/pl.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/pl.json
@@ -567,6 +567,8 @@
     },
     "Title": "Quick Controls"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "O Programie"
@@ -740,6 +742,7 @@
       "Blue": "Niebieski",
       "Brightness": "Jasnosć",
       "Dark": "Ciemny",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Język",
       "Light": "Jasny",
       "Local": "Lokalne",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC i Lokalny"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Kwi",
     "Aug": "Sie",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/pt-BR.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/pt-BR.json
index faf640c68fa..67dac973a42 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/pt-BR.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/pt-BR.json
@@ -567,6 +567,8 @@
     },
     "Title": "Quick Controls"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "Sobre"
@@ -740,6 +742,7 @@
       "Blue": "Azul",
       "Brightness": "Brilho",
       "Dark": "Escuro",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Idioma",
       "Light": "Claro",
       "Local": "Local",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC e local"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Abr",
     "Aug": "Ago",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/pt-PT.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/pt-PT.json
index e6283df0e84..928d98be566 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/pt-PT.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/pt-PT.json
@@ -567,6 +567,8 @@
     },
     "Title": "Controlos Rápidos"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "Acerca"
@@ -740,6 +742,7 @@
       "Blue": "Azul",
       "Brightness": "Brilho",
       "Dark": "Escuro",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Idioma",
       "Light": "Luz",
       "Local": "Local",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC e Local"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Abr",
     "Aug": "Ago",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/ro.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/ro.json
index 975afae915e..91af4bd85eb 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/ro.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/ro.json
@@ -567,6 +567,8 @@
     },
     "Title": "Quick Controls"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "Despre"
@@ -740,6 +742,7 @@
       "Blue": "Albastru",
       "Brightness": "Luminozitate",
       "Dark": "Întuneric",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Limbă",
       "Light": "Lumină",
       "Local": "Local",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC și local"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Apr",
     "Aug": "Aug",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/ru.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/ru.json
index 9a3b0dec242..bbedc877538 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/ru.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/ru.json
@@ -567,6 +567,8 @@
     },
     "Title": "Quick Controls"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "Описание"
@@ -740,6 +742,7 @@
       "Blue": "Синяя",
       "Brightness": "Яркость",
       "Dark": "Темная",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Язык",
       "Light": "Светлая",
       "Local": "Местное",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC и местное"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Апр",
     "Aug": "Авг",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/sk.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/sk.json
index 0f53eee1c7d..6e45401688f 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/sk.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/sk.json
@@ -567,6 +567,8 @@
     },
     "Title": "Quick Controls"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "O aplikácií"
@@ -740,6 +742,7 @@
       "Blue": "Modrá",
       "Brightness": "Jas",
       "Dark": "Tmavá",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Jazyk",
       "Light": "Svetlá",
       "Local": "Lokálne",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC a lokálne"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "apr",
     "Aug": "aug",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/sl.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/sl.json
index 9d4504aba6d..d079c010ada 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/sl.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/sl.json
@@ -567,6 +567,8 @@
     },
     "Title": "Hitri nadzor"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "Vizitka"
@@ -740,6 +742,7 @@
       "Blue": "Modro",
       "Brightness": "Svetlost",
       "Dark": "Temno",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Jezik",
       "Light": "Svetlo",
       "Local": "Lokalni čas",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC in lokalni čas"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Apr",
     "Aug": "Avg",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/sr-Latn.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/sr-Latn.json
index 7c48c00553b..98138d89738 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/sr-Latn.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/sr-Latn.json
@@ -567,6 +567,8 @@
     },
     "Title": "Quick Controls"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "About"
@@ -740,6 +742,7 @@
       "Blue": "Blue",
       "Brightness": "Brightness",
       "Dark": "Dark",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Language",
       "Light": "Light",
       "Local": "Local",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC and Local"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Apr",
     "Aug": "Aug",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/sv.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/sv.json
index 8ab23e8dc42..35a4fe369e0 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/sv.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/sv.json
@@ -567,6 +567,8 @@
     },
     "Title": "Snabbinställningar"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "Om"
@@ -740,6 +742,7 @@
       "Blue": "Blå",
       "Brightness": "Ljusstyrka",
       "Dark": "Mörk",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Språk",
       "Light": "Ljus",
       "Local": "Lokal",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC och lokal"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Apr",
     "Aug": "Aug",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/th.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/th.json
index eb013f3311f..1fe460d19ea 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/th.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/th.json
@@ -567,6 +567,8 @@
     },
     "Title": "Quick Controls"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "เกี่ยวกับ"
@@ -740,6 +742,7 @@
       "Blue": "ฟ้า",
       "Brightness": "ความสว่าง",
       "Dark": "มืด",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "ภาษา",
       "Light": "สว่าง",
       "Local": "ท้องถิ่น",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC และท้องถิ่น"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "เม.ย.",
     "Aug": "ส.ค.",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/tr.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/tr.json
index d7bac4e8753..36943542b42 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/tr.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/tr.json
@@ -567,6 +567,8 @@
     },
     "Title": "Hızlı Kontroller"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "Hakkında"
@@ -740,6 +742,7 @@
       "Blue": "Mavi",
       "Brightness": "Parlaklık",
       "Dark": "Koyu",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Dil",
       "Light": "Açık",
       "Local": "Yerel",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC ve Yerel"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Nis",
     "Aug": "Ağu",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/uk.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/uk.json
index 7c48c00553b..98138d89738 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/uk.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/uk.json
@@ -567,6 +567,8 @@
     },
     "Title": "Quick Controls"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "About"
@@ -740,6 +742,7 @@
       "Blue": "Blue",
       "Brightness": "Brightness",
       "Dark": "Dark",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Language",
       "Light": "Light",
       "Local": "Local",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC and Local"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Apr",
     "Aug": "Aug",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/vi.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/vi.json
index a99e8deedc3..c42f4ffcd6e 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/vi.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/vi.json
@@ -352,7 +352,7 @@
       "CrosswindAboveLimitMessage": "Bạn có muốn thực hiện tính toán với {actual_crosswind} knot không?",
       "CrosswindAboveLimitTitle": "Gió giật ngang tối đa là {max_crosswind} knot",
       "EnterManually": "Nhập thủ công",
-      "EntryAngle": "Entry Angle",
+      "EntryAngle": "Góc vào",
       "EntryAngles": {
         "0": "0°",
         "90": "90°",
@@ -368,8 +368,8 @@
         "MaximumTailwind": "Above Maximum Tailwind ({max_tailwind} knots)",
         "MaximumTemperature": "Above Maximum OAT ({tmax}°C)",
         "MaximumTireSpeed": "Maximum Tire Speed Not Satisfied",
-        "OperatingEmptyWeight": "Below Operating Empty Weight ({oew} {weight_unit})",
-        "StructuralMtow": "Above Structural MTOW ({structural_mtow} {weight_unit})",
+        "OperatingEmptyWeight": "Dưới trọng lượng rỗng hoạt động ({oew} {weight_unit})",
+        "StructuralMtow": "Trên MTOW Cấu trúc ({structural_mtow} {weight_unit})",
         "TooHeavy": "Beyond Takeoff Weight Limit - Max {mtow} {weight_unit}",
         "TooLight": "Below Minimum Takeoff Weight",
         "VmcgVmcaLimits": "VMCG/VMCA Limits Not Satisfied"
@@ -567,6 +567,8 @@
     },
     "Title": "Bảng điều khiển nhanh"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "Giới thiệu"
@@ -740,6 +742,7 @@
       "Blue": "Xanh lam",
       "Brightness": "Độ sáng",
       "Dark": "Tối",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Ngôn ngữ",
       "Light": "Sáng",
       "Local": "Cục bộ",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC và địa phương"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Thg 4",
     "Aug": "Thg 8",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/zh-Hans-CN.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/zh-Hans-CN.json
index 9e6a096c9d3..8e9dd664a4a 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/zh-Hans-CN.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/zh-Hans-CN.json
@@ -567,6 +567,8 @@
     },
     "Title": "Quick Controls"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "相关"
@@ -740,6 +742,7 @@
       "Blue": "蓝色",
       "Brightness": "亮度",
       "Dark": "深色",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "语言 (Language)",
       "Light": "浅色",
       "Local": "本地",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "世界标准时间 (UTC) 与本地时间"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "四月",
     "Aug": "八月",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/zh-Hant-HK.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/zh-Hant-HK.json
index c96626f8c45..a1ef1b589bb 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/zh-Hant-HK.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/zh-Hant-HK.json
@@ -567,6 +567,8 @@
     },
     "Title": "Quick Controls"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "有關"
@@ -740,6 +742,7 @@
       "Blue": "藍色",
       "Brightness": "亮度",
       "Dark": "深色",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "語言 (Language)",
       "Light": "淺色",
       "Local": "本地",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC 和本地時間"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "四月",
     "Aug": "八月",
diff --git a/fbw-common/src/systems/instruments/src/EFB/Localization/data/zh-Hant-TW.json b/fbw-common/src/systems/instruments/src/EFB/Localization/data/zh-Hant-TW.json
index e2e6f4c0895..ed5696bbede 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Localization/data/zh-Hant-TW.json
+++ b/fbw-common/src/systems/instruments/src/EFB/Localization/data/zh-Hant-TW.json
@@ -567,6 +567,8 @@
     },
     "Title": "Quick Controls"
   },
+  "QuickControls.TT.CabinAutoBrightness": "Turn Auto Cabin Lighting On/Off",
+  "QuickControls.TT.CabinLighting": "Set Cabin Lighting",
   "Settings": {
     "About": {
       "Title": "相關"
@@ -740,6 +742,7 @@
       "Blue": "Blue",
       "Brightness": "Brightness",
       "Dark": "Dark",
+      "DisablePushbackConflictWarning": "Disable pushback system conflict warning",
       "Language": "Language",
       "Light": "Light",
       "Local": "Local",
@@ -756,6 +759,8 @@
       "UtcAndLocal": "UTC and Local"
     }
   },
+  "Settings.SimOptions.CabinAutoBrightness": "Auto Cabin Lighting",
+  "Settings.SimOptions.CabinManualBrightness": "Cabin Lighting Brightness",
   "StatusBar": {
     "Apr": "Apr",
     "Aug": "Aug",
diff --git a/fbw-common/src/systems/instruments/src/ND/ND.tsx b/fbw-common/src/systems/instruments/src/ND/ND.tsx
index b70069b820e..d0ca819acea 100644
--- a/fbw-common/src/systems/instruments/src/ND/ND.tsx
+++ b/fbw-common/src/systems/instruments/src/ND/ND.tsx
@@ -149,8 +149,6 @@ export class NDComponent<T extends number> extends DisplayComponent<NDProps<T>>
 
   private showOans = Subject.create<boolean>(false);
 
-  private showOansRunwayInfo = Subject.create<boolean>(false);
-
   onAfterRender(node: VNode) {
     super.onAfterRender(node);
 
@@ -217,7 +215,6 @@ export class NDComponent<T extends number> extends DisplayComponent<NDProps<T>>
       .whenChanged()
       .handle((mode) => {
         this.handleNewMapPage(mode);
-        this.shouldShowOansRunwayInfo();
       });
 
     this.mapRecomputing.sub((recomputing) => {
@@ -344,21 +341,17 @@ export class NDComponent<T extends number> extends DisplayComponent<NDProps<T>>
     }
   }
 
-  private shouldShowOansRunwayInfo() {
-    this.showOansRunwayInfo.set(true); // Maybe only active when this.currentPageMode.get() === EfisNdMode.PLAN ?
-  }
-
   render(): VNode | null {
     return (
       <>
         <div style={{ display: this.showOans.map((it) => (it ? 'block' : 'none')) }}>
-          <div style={{ display: this.showOansRunwayInfo.map((it) => (it ? 'none' : 'block')) }}>
+          <div style={{ display: this.currentPageMode.map((it) => (it === EfisNdMode.PLAN ? 'none' : 'block')) }}>
             <svg class="nd-svg" viewBox="0 0 768 768" style="transform: rotateX(0deg);">
               <WindIndicator bus={this.props.bus} />
               <SpeedIndicator bus={this.props.bus} />
             </svg>
           </div>
-          <div style={{ display: this.showOansRunwayInfo.map((it) => (it ? 'block' : 'none')) }}>
+          <div style={{ display: this.currentPageMode.map((it) => (it === EfisNdMode.PLAN ? 'block' : 'none')) }}>
             <svg class="nd-svg" viewBox="0 0 768 768" style="transform: rotateX(0deg);">
               <BtvRunwayInfo bus={this.props.bus} />
               <SpeedIndicator bus={this.props.bus} />
diff --git a/fbw-common/src/systems/instruments/src/OANC/Oanc.tsx b/fbw-common/src/systems/instruments/src/OANC/Oanc.tsx
index ffd4aa358dd..a38305af5a5 100644
--- a/fbw-common/src/systems/instruments/src/OANC/Oanc.tsx
+++ b/fbw-common/src/systems/instruments/src/OANC/Oanc.tsx
@@ -32,7 +32,6 @@ import {
   EfisSide,
   FmsOansData,
   FcuSimVars,
-  Runway,
 } from '@flybywiresim/fbw-sdk';
 import {
   BBox,
@@ -54,7 +53,7 @@ import { bearingTo, clampAngle, Coordinates, distanceTo, placeBearingDistance }
 import { OansControlEvents } from './OansControlEventPublisher';
 import { reciprocal } from '@fmgc/guidance/lnav/CommonGeometry';
 import { FmsDataStore } from './OancControlPanelUtils';
-import { BrakeToVacateUtils } from './BrakeToVacateUtils';
+import { OansBrakeToVacateSelection } from './OansBrakeToVacateSelection';
 import { STYLE_DATA } from './style-data';
 import { OancMovingModeOverlay, OancStaticModeOverlay } from './OancMovingModeOverlay';
 import { OancAircraftIcon } from './OancAircraftIcon';
@@ -62,7 +61,6 @@ import { OancLabelManager } from './OancLabelManager';
 import { OancPositionComputer } from './OancPositionComputer';
 import { NavigraphAmdbClient } from './api/NavigraphAmdbClient';
 import { globalToAirportCoordinates, pointAngle, pointDistance } from './OancMapUtils';
-import { NavigationDatabaseService } from '@fmgc/index';
 
 export const OANC_RENDER_WIDTH = 768;
 export const OANC_RENDER_HEIGHT = 768;
@@ -312,7 +310,7 @@ export class Oanc<T extends number> extends DisplayComponent<OancProps<T>> {
 
   private readonly fmsDataStore = new FmsDataStore(this.props.bus);
 
-  private readonly btvUtils = new BrakeToVacateUtils<T>(
+  private readonly btvUtils = new OansBrakeToVacateSelection<T>(
     this.props.bus,
     this.labelManager,
     this.aircraftOnGround,
@@ -360,42 +358,6 @@ export class Oanc<T extends number> extends DisplayComponent<OancProps<T>> {
 
   private readonly oansNotAvailable = ConsumerSubject.create(this.sub.on('oansNotAvail'), true);
 
-  public static async setBtvRunwayFromFmsRunway(
-    fmsDataStore: FmsDataStore,
-    btvUtils: BrakeToVacateUtils<number>,
-  ): Promise<[Runway, Coordinates]> {
-    const destination = fmsDataStore.destination.get();
-    const rwyIdent = fmsDataStore.landingRunway.get();
-    if (destination && rwyIdent) {
-      const db = NavigationDatabaseService.activeDatabase.backendDatabase;
-
-      const arps = await db.getAirports([destination]);
-      const arpCoordinates = arps[0].location;
-
-      const runways = await db.getRunways(destination);
-      const landingRunwayNavdata = runways.filter((rw) => rw.ident === rwyIdent)[0];
-      const oppositeThreshold = placeBearingDistance(
-        landingRunwayNavdata.thresholdLocation,
-        landingRunwayNavdata.bearing,
-        landingRunwayNavdata.length / MathUtils.METRES_TO_NAUTICAL_MILES,
-      );
-      const localThr: Position = [0, 0];
-      const localOppThr: Position = [0, 0];
-      globalToAirportCoordinates(arpCoordinates, landingRunwayNavdata.thresholdLocation, localThr);
-      globalToAirportCoordinates(arpCoordinates, oppositeThreshold, localOppThr);
-
-      btvUtils.selectRunwayFromNavdata(
-        rwyIdent,
-        landingRunwayNavdata.length,
-        landingRunwayNavdata.bearing,
-        localThr,
-        localOppThr,
-      );
-
-      return [landingRunwayNavdata, arpCoordinates];
-    }
-  }
-
   public getZoomLevelInverseScale() {
     const multiplier = this.overlayNDModeSub.get() === EfisNdMode.ROSE_NAV ? 0.5 : 1;
 
@@ -443,13 +405,6 @@ export class Oanc<T extends number> extends DisplayComponent<OancProps<T>> {
       }
     }, true);
 
-    // This lead to BTV being disarmed at 300ft. We'll have to investigate and then fix FIXME
-    /* this.btvUtils.below300ftRaAndLanding.sub(async (v) => {
-      if (this.oansNotAvailable.get() === false && v && !this.btvUtils.runwayIsSet()) {
-        [, this.arpCoordinates] = await Oanc.setBtvRunwayFromFmsRunway(this.fmsDataStore, this.btvUtils);
-      }
-    });*/
-
     this.fmsDataStore.origin.sub(() => this.updateLabelClasses());
     this.fmsDataStore.departureRunway.sub(() => this.updateLabelClasses());
     this.fmsDataStore.destination.sub(() => this.updateLabelClasses());
@@ -1012,15 +967,13 @@ export class Oanc<T extends number> extends DisplayComponent<OancProps<T>> {
 
     this.projectCoordinates(this.ppos, this.projectedPpos);
 
-    if (this.props.side === 'L') {
-      this.btvUtils.updateRemainingDistances(this.projectedPpos);
-      this.btvUtils.updateRwyAheadAdvisory(
-        this.ppos,
-        this.arpCoordinates,
-        this.planeTrueHeading.get(),
-        this.layerFeatures[2],
-      );
-    }
+    this.props.bus.getPublisher<FmsOansData>().pub('oansAirportLocalCoordinates', this.projectedPpos, true);
+    this.btvUtils.updateRwyAheadAdvisory(
+      this.ppos,
+      this.arpCoordinates,
+      this.planeTrueHeading.get(),
+      this.layerFeatures[2],
+    );
 
     // If OANS is not visible on this side (i.e. range selector is not on ZOOM), don't continue here to save runtime
     if (!this.oansVisible.get()) {
diff --git a/fbw-common/src/systems/instruments/src/OANC/BrakeToVacateUtils.ts b/fbw-common/src/systems/instruments/src/OANC/OansBrakeToVacateSelection.ts
similarity index 81%
rename from fbw-common/src/systems/instruments/src/OANC/BrakeToVacateUtils.ts
rename to fbw-common/src/systems/instruments/src/OANC/OansBrakeToVacateSelection.ts
index 0238727ab00..aee1a7cc47c 100644
--- a/fbw-common/src/systems/instruments/src/OANC/BrakeToVacateUtils.ts
+++ b/fbw-common/src/systems/instruments/src/OANC/OansBrakeToVacateSelection.ts
@@ -2,22 +2,22 @@
 // SPDX-License-Identifier: GPL-3.0
 
 import { ConsumerSubject, EventBus, MappedSubject, NodeReference, Subject, Subscribable } from '@microsoft/msfs-sdk';
-import { AmdbProperties, Arinc429LocalVarConsumerSubject, FmsOansData } from '@flybywiresim/fbw-sdk';
+import { AmdbProperties, Arinc429LocalVarConsumerSubject, FmsOansData, Runway } from '@flybywiresim/fbw-sdk';
 import {
+  booleanContains,
+  booleanDisjoint,
   Feature,
   FeatureCollection,
   Geometry,
-  Polygon,
-  Position,
-  booleanContains,
-  booleanDisjoint,
   lineOffset,
   lineString,
   point,
   polygon,
+  Polygon,
+  Position,
 } from '@turf/turf';
 import { Arinc429Register, Arinc429SignStatusMatrix, MathUtils } from '@flybywiresim/fbw-sdk';
-import { Label, LabelStyle } from './';
+import { FmsDataStore, Label, LabelStyle } from '.';
 import { BtvData } from '../../../shared/src/publishers/OansBtv/BtvPublisher';
 import { OancLabelManager } from './OancLabelManager';
 import {
@@ -28,9 +28,9 @@ import {
   pointToLineDistance,
 } from './OancMapUtils';
 import { Coordinates, placeBearingDistance } from 'msfs-geo';
-import { GenericAdirsEvents } from '../ND/types/GenericAdirsEvents';
+import { NavigationDatabaseService } from '@fmgc/index';
 
-const MIN_TOUCHDOWN_ZONE_DISTANCE = 400; // Minimum distance from threshold to touch down zone
+export const MIN_TOUCHDOWN_ZONE_DISTANCE = 400; // Minimum distance from threshold to touch down zone
 const CLAMP_DRY_STOPBAR_DISTANCE = 100; // If stop bar is <> meters behind end of runway, clamp to this distance behind end of runway
 const CLAMP_WET_STOPBAR_DISTANCE = 200; // If stop bar is <> meters behind end of runway, clamp to this distance behind end of runway
 
@@ -38,19 +38,13 @@ const CLAMP_WET_STOPBAR_DISTANCE = 200; // If stop bar is <> meters behind end o
  * Utility class for brake to vacate (BTV) functions on the A380
  */
 
-export class BrakeToVacateUtils<T extends number> {
-  private readonly sub = this.bus.getSubscriber<BtvData & GenericAdirsEvents>();
-
-  private readonly remainingDistToExitArinc = Arinc429Register.empty();
-
-  private readonly remaininingDistToRwyEndArinc = Arinc429Register.empty();
+export class OansBrakeToVacateSelection<T extends number> {
+  private readonly sub = this.bus.getSubscriber<BtvData & FmsOansData>();
 
   private readonly runwayLengthArinc = Arinc429Register.empty();
 
   private readonly runwayBearingArinc = Arinc429Register.empty();
 
-  private readonly requestedStoppingDistArinc = Arinc429Register.empty();
-
   constructor(
     private readonly bus: EventBus,
     private readonly labelManager?: OancLabelManager<T>,
@@ -62,27 +56,6 @@ export class BrakeToVacateUtils<T extends number> {
     private readonly zoomLevelIndex?: Subscribable<number>,
     private getZoomLevelInverseScale?: () => number,
   ) {
-    this.remainingDistToExit.sub((v) => {
-      this.remainingDistToExitArinc.setValue(v < 0 ? 0 : v);
-      this.remainingDistToExitArinc.setSsm(
-        v < 0 ? Arinc429SignStatusMatrix.NoComputedData : Arinc429SignStatusMatrix.NormalOperation,
-      );
-      this.remainingDistToExitArinc.writeToSimVar('L:A32NX_OANS_BTV_REMAINING_DIST_TO_EXIT');
-    });
-
-    this.remaininingDistToRwyEnd.sub((v) => {
-      this.remaininingDistToRwyEndArinc.setValue(v < 0 ? 0 : v);
-      this.remaininingDistToRwyEndArinc.setSsm(
-        v < 0 ? Arinc429SignStatusMatrix.NoComputedData : Arinc429SignStatusMatrix.NormalOperation,
-      );
-      this.remaininingDistToRwyEndArinc.writeToSimVar('L:A32NX_OANS_BTV_REMAINING_DIST_TO_RWY_END');
-    });
-
-    this.sub
-      .on('groundSpeed')
-      .atFrequency(2)
-      .handle((value) => this.groundSpeed.set(value));
-
     this.dryStoppingDistance.sub(() => this.drawBtvLayer());
     this.wetStoppingDistance.sub(() => this.drawBtvLayer());
     this.liveStoppingDistance.sub(() => this.drawBtvLayer());
@@ -93,13 +66,10 @@ export class BrakeToVacateUtils<T extends number> {
     this.clearSelection();
   }
 
-  private readonly groundSpeed = Arinc429Register.empty();
-
   /** Updated during deceleration on the ground. Counted from touchdown distance (min. 400m).  */
-  private readonly remainingDistToExit = Subject.create<number>(0);
-
-  /** Updated during deceleration on the ground. Counted from touchdown distance (min. 400m).  */
-  private readonly remaininingDistToRwyEnd = Subject.create<number>(0);
+  private readonly remaininingDistToRwyEnd = Arinc429LocalVarConsumerSubject.create(
+    this.sub.on('oansRemainingDistToRwyEnd'),
+  );
 
   readonly btvRunway = Subject.create<string | null>(null);
 
@@ -123,17 +93,6 @@ export class BrakeToVacateUtils<T extends number> {
 
   private btvExitPosition: Position;
 
-  private btvPathGeometry: Position[];
-
-  /** Stopping distance for dry rwy conditions, in meters. Null if not set. Counted from touchdown distance (min. 400m).  */
-  private readonly dryStoppingDistance = ConsumerSubject.create(this.sub.on('dryStoppingDistance').whenChanged(), 0);
-
-  /** Stopping distance for wet rwy conditions, in meters. Null if not set. Counted from touchdown distance (min. 400m).  */
-  private readonly wetStoppingDistance = ConsumerSubject.create(this.sub.on('wetStoppingDistance').whenChanged(), 0);
-
-  /** Live remaining stopping distance during deceleration, in meters. Null if not set. Counted from actual aircraft position. */
-  private readonly liveStoppingDistance = ConsumerSubject.create(this.sub.on('stopBarDistance').whenChanged(), 0);
-
   /** "runway ahead" advisory was triggered */
   private rwyAheadTriggered: boolean = false;
 
@@ -153,10 +112,53 @@ export class BrakeToVacateUtils<T extends number> {
 
   private readonly rwyAheadArinc = Arinc429Register.empty();
 
+  private btvPathGeometry: Position[];
+
+  /** Stopping distance for dry rwy conditions, in meters. Null if not set. Counted from touchdown distance (min. 400m).  */
+  private readonly dryStoppingDistance = ConsumerSubject.create(this.sub.on('dryStoppingDistance').whenChanged(), 0);
+
+  /** Stopping distance for wet rwy conditions, in meters. Null if not set. Counted from touchdown distance (min. 400m).  */
+  private readonly wetStoppingDistance = ConsumerSubject.create(this.sub.on('wetStoppingDistance').whenChanged(), 0);
+
+  /** Live remaining stopping distance during deceleration, in meters. Null if not set. Counted from actual aircraft position. */
+  private readonly liveStoppingDistance = ConsumerSubject.create(this.sub.on('stopBarDistance').whenChanged(), 0);
+
   private readonly radioAltitude1 = Arinc429LocalVarConsumerSubject.create(this.sub.on('radioAltitude_1'));
   private readonly radioAltitude2 = Arinc429LocalVarConsumerSubject.create(this.sub.on('radioAltitude_2'));
   private readonly radioAltitude3 = Arinc429LocalVarConsumerSubject.create(this.sub.on('radioAltitude_3'));
 
+  private readonly groundSpeed1 = Arinc429LocalVarConsumerSubject.create(this.sub.on('groundSpeed_1'));
+  private readonly groundSpeed2 = Arinc429LocalVarConsumerSubject.create(this.sub.on('groundSpeed_2'));
+  private readonly groundSpeed3 = Arinc429LocalVarConsumerSubject.create(this.sub.on('groundSpeed_3'));
+  private readonly groundSpeed = MappedSubject.create(
+    ([gs1, gs2, gs3]) => {
+      if (gs1.isNormalOperation()) {
+        return gs1;
+      } else if (gs2.isNormalOperation()) {
+        return gs2;
+      } else {
+        return gs3;
+      }
+    },
+    this.groundSpeed1,
+    this.groundSpeed2,
+    this.groundSpeed3,
+  );
+
+  private readonly lgciuDiscreteWord2_1 = Arinc429LocalVarConsumerSubject.create(this.sub.on('lgciuDiscreteWord2_1'));
+  private readonly lgciuDiscreteWord2_2 = Arinc429LocalVarConsumerSubject.create(this.sub.on('lgciuDiscreteWord2_2'));
+  private readonly onGround = MappedSubject.create(
+    ([g1, g2]) => {
+      if (g1.isNormalOperation()) {
+        return g1.bitValue(11);
+      } else {
+        return g2.bitValueOr(11, false);
+      }
+    },
+    this.lgciuDiscreteWord2_1,
+    this.lgciuDiscreteWord2_2,
+  );
+
   private readonly fwsFlightPhase = ConsumerSubject.create(this.sub.on('fwcFlightPhase'), 0);
 
   public readonly below300ftRaAndLanding = MappedSubject.create(
@@ -198,11 +200,10 @@ export class BrakeToVacateUtils<T extends number> {
     this.btvRunwayLda.set(lda);
     this.btvRunwayBearingTrue.set(heading);
     this.btvRunway.set(runway);
-    this.remaininingDistToRwyEnd.set(lda - MIN_TOUCHDOWN_ZONE_DISTANCE);
-    this.remainingDistToExit.set(lda - MIN_TOUCHDOWN_ZONE_DISTANCE);
 
     const pub = this.bus.getPublisher<FmsOansData>();
-    pub.pub('oansSelectedLandingRunway', runway, true);
+    pub.pub('oansSelectedLandingRunway', runway);
+    pub.pub('oansThresholdPositions', [this.btvThresholdPosition, this.btvOppositeThresholdPosition], true);
 
     this.runwayLengthArinc.setValue(lda);
     this.runwayLengthArinc.setSsm(Arinc429SignStatusMatrix.NormalOperation);
@@ -261,6 +262,7 @@ export class BrakeToVacateUtils<T extends number> {
       return;
     }
     this.btvExitPosition = exitDistFromCenterLine1 < exitDistFromCenterLine2 ? exitLoc1 : exitLoc2;
+    this.bus.getPublisher<FmsOansData>().pub('oansExitPosition', this.btvExitPosition, true);
 
     // Subtract 400m due to distance of touchdown zone from threshold
     const exitDistance =
@@ -268,10 +270,6 @@ export class BrakeToVacateUtils<T extends number> {
       MIN_TOUCHDOWN_ZONE_DISTANCE;
 
     this.bus.getPublisher<FmsOansData>().pub('oansSelectedExit', exit);
-    this.requestedStoppingDistArinc.setValue(exitDistance);
-    this.requestedStoppingDistArinc.setSsm(Arinc429SignStatusMatrix.NormalOperation);
-    this.requestedStoppingDistArinc.writeToSimVar('L:A32NX_OANS_BTV_REQ_STOPPING_DISTANCE');
-
     this.bus.getPublisher<FmsOansData>().pub('ndBtvMessage', `BTV ${this.btvRunway.get().substring(4)}/${exit}`, true);
 
     this.btvPathGeometry = Array.from(feature.geometry.coordinates as Position[]);
@@ -301,11 +299,10 @@ export class BrakeToVacateUtils<T extends number> {
     this.btvRunwayLda.set(lda);
     this.btvRunwayBearingTrue.set(heading);
     this.btvRunway.set(runway);
-    this.remaininingDistToRwyEnd.set(lda - MIN_TOUCHDOWN_ZONE_DISTANCE);
-    this.remainingDistToExit.set(lda - MIN_TOUCHDOWN_ZONE_DISTANCE);
 
     const pub = this.bus.getPublisher<FmsOansData>();
-    pub.pub('oansSelectedLandingRunway', runway, true);
+    pub.pub('oansSelectedLandingRunway', runway);
+    pub.pub('oansThresholdPositions', [this.btvThresholdPosition, this.btvOppositeThresholdPosition], true);
 
     this.runwayLengthArinc.setValue(lda);
     this.runwayLengthArinc.setSsm(Arinc429SignStatusMatrix.NormalOperation);
@@ -316,26 +313,50 @@ export class BrakeToVacateUtils<T extends number> {
     this.runwayBearingArinc.writeToSimVar('L:A32NX_OANS_RWY_BEARING');
   }
 
-  runwayIsSet() {
-    return (
-      this.btvThresholdPosition.length !== 0 &&
-      this.btvOppositeThresholdPosition.length !== 0 &&
-      this.btvRunway.get() !== null
-    );
+  public async setBtvRunwayFromFmsRunway(fmsDataStore: FmsDataStore): Promise<[Runway, Coordinates]> {
+    const destination = fmsDataStore.destination.get();
+    const rwyIdent = fmsDataStore.landingRunway.get();
+    if (destination && rwyIdent) {
+      const db = NavigationDatabaseService.activeDatabase.backendDatabase;
+
+      const arps = await db.getAirports([destination]);
+      const arpCoordinates = arps[0].location;
+
+      const runways = await db.getRunways(destination);
+      const landingRunwayNavdata = runways.filter((rw) => rw.ident === rwyIdent)[0];
+      const oppositeThreshold = placeBearingDistance(
+        landingRunwayNavdata.thresholdLocation,
+        landingRunwayNavdata.bearing,
+        landingRunwayNavdata.length / MathUtils.METRES_TO_NAUTICAL_MILES,
+      );
+      const localThr: Position = [0, 0];
+      const localOppThr: Position = [0, 0];
+      globalToAirportCoordinates(arpCoordinates, landingRunwayNavdata.thresholdLocation, localThr);
+      globalToAirportCoordinates(arpCoordinates, oppositeThreshold, localOppThr);
+
+      this.selectRunwayFromNavdata(
+        rwyIdent,
+        landingRunwayNavdata.length,
+        landingRunwayNavdata.bearing,
+        localThr,
+        localOppThr,
+      );
+
+      return [landingRunwayNavdata, arpCoordinates];
+    }
   }
 
   selectExitFromManualEntry(reqStoppingDistance: number, btvExitPosition: Position) {
     this.btvExitPosition = btvExitPosition;
 
-    // Account for touchdown zone distance
-    const correctedStoppingDistance = reqStoppingDistance - MIN_TOUCHDOWN_ZONE_DISTANCE;
+    // Requested stopping distance measured from runway threshold (i.e. LDA)
+    const correctedStoppingDistance = reqStoppingDistance;
 
-    this.bus.getPublisher<FmsOansData>().pub('oansSelectedExit', 'N/A');
-    this.requestedStoppingDistArinc.setValue(correctedStoppingDistance);
-    this.requestedStoppingDistArinc.setSsm(Arinc429SignStatusMatrix.NormalOperation);
-    this.requestedStoppingDistArinc.writeToSimVar('L:A32NX_OANS_BTV_REQ_STOPPING_DISTANCE');
+    const pub = this.bus.getPublisher<FmsOansData>();
+    pub.pub('oansSelectedExit', 'N/A');
+    pub.pub('oansExitPosition', this.btvExitPosition, true);
 
-    this.bus.getPublisher<FmsOansData>().pub('ndBtvMessage', `BTV ${this.btvRunway.get().substring(4)}/MANUAL`, true);
+    pub.pub('ndBtvMessage', `BTV ${this.btvRunway.get().substring(4)}/MANUAL`, true);
 
     this.btvExitDistance.set(correctedStoppingDistance);
     this.btvExit.set('N/A');
@@ -355,8 +376,10 @@ export class BrakeToVacateUtils<T extends number> {
     this.drawBtvLayer();
 
     const pub = this.bus.getPublisher<FmsOansData>();
-    pub.pub('oansSelectedLandingRunway', null, true);
+    pub.pub('oansSelectedLandingRunway', null);
     pub.pub('oansSelectedExit', null, true);
+    pub.pub('oansThresholdPositions', [], true);
+    pub.pub('oansExitPosition', [], true);
     pub.pub('ndBtvMessage', '', true);
 
     this.runwayLengthArinc.setValue(0);
@@ -366,65 +389,6 @@ export class BrakeToVacateUtils<T extends number> {
     this.runwayBearingArinc.setValue(0);
     this.runwayBearingArinc.setSsm(Arinc429SignStatusMatrix.NoComputedData);
     this.runwayBearingArinc.writeToSimVar('L:A32NX_OANS_RWY_BEARING');
-
-    this.requestedStoppingDistArinc.setValue(0);
-    this.requestedStoppingDistArinc.setSsm(Arinc429SignStatusMatrix.NoComputedData);
-    this.requestedStoppingDistArinc.writeToSimVar('L:A32NX_OANS_BTV_REQ_STOPPING_DISTANCE');
-
-    this.remainingDistToExit.set(-1);
-    this.remaininingDistToRwyEnd.set(-1);
-  }
-
-  updateRemainingDistances(pos: Position) {
-    // Only update below 600ft AGL, and in landing FMGC phase
-    const ra1 = this.radioAltitude1.get();
-    const ra2 = this.radioAltitude2.get();
-    const ra3 = this.radioAltitude3.get();
-
-    if (
-      !(ra1.valueOr(2500) < 600 || ra2.valueOr(2500) < 600 || ra3.valueOr(2500) < 600) ||
-      this.fwsFlightPhase.get() < 9 ||
-      this.fwsFlightPhase.get() > 11
-    ) {
-      this.remaininingDistToRwyEnd.set(-1);
-      this.remainingDistToExit.set(-1);
-      return;
-    }
-
-    if (this.btvThresholdPosition && this.btvThresholdPosition.length > 0) {
-      if (this.btvOppositeThresholdPosition && this.btvOppositeThresholdPosition.length > 0) {
-        const rwyEndDistanceFromTdz =
-          pointDistance(
-            this.btvThresholdPosition[0],
-            this.btvThresholdPosition[1],
-            this.btvOppositeThresholdPosition[0],
-            this.btvOppositeThresholdPosition[1],
-          ) - MIN_TOUCHDOWN_ZONE_DISTANCE;
-
-        const rwyEndDistance = pointDistance(
-          pos[0],
-          pos[1],
-          this.btvOppositeThresholdPosition[0],
-          this.btvOppositeThresholdPosition[1],
-        );
-
-        this.remaininingDistToRwyEnd.set(MathUtils.round(Math.min(rwyEndDistanceFromTdz, rwyEndDistance), 0.1));
-      }
-
-      if (this.btvExitPosition && this.btvExitPosition.length > 0) {
-        const exitDistanceFromTdz =
-          pointDistance(
-            this.btvThresholdPosition[0],
-            this.btvThresholdPosition[1],
-            this.btvExitPosition[0],
-            this.btvExitPosition[1],
-          ) - MIN_TOUCHDOWN_ZONE_DISTANCE;
-
-        const exitDistance = pointDistance(pos[0], pos[1], this.btvExitPosition[0], this.btvExitPosition[1]);
-
-        this.remainingDistToExit.set(MathUtils.round(Math.min(exitDistanceFromTdz, exitDistance), 0.1));
-      }
-    }
   }
 
   drawBtvPath() {
@@ -605,13 +569,18 @@ export class BrakeToVacateUtils<T extends number> {
     }
 
     // On ground & above 25kts: STOP line
-    if (this.liveStoppingDistance.get() > 0 && this.aircraftOnGround.get() && this.groundSpeed.value > 25) {
-      const liveRunOverCondition = this.remaininingDistToRwyEnd.get() - this.liveStoppingDistance.get() <= 0;
+    const distToRwyEnd = this.remaininingDistToRwyEnd.get();
+    if (
+      this.liveStoppingDistance.get() > 0 &&
+      this.aircraftOnGround.get() &&
+      this.groundSpeed.get().value > 25 &&
+      distToRwyEnd.ssm === Arinc429SignStatusMatrix.NormalOperation
+    ) {
+      const liveRunOverCondition = distToRwyEnd.value - this.liveStoppingDistance.get() <= 0;
       // If runover predicted, draw stop bar a little behind the runway end
       const distanceToDraw =
-        liveRunOverCondition &&
-        this.liveStoppingDistance.get() - this.remaininingDistToRwyEnd.get() > CLAMP_DRY_STOPBAR_DISTANCE
-          ? this.remaininingDistToRwyEnd.get() + 100
+        liveRunOverCondition && this.liveStoppingDistance.get() - distToRwyEnd.value > CLAMP_DRY_STOPBAR_DISTANCE
+          ? distToRwyEnd.value + 100
           : this.liveStoppingDistance.get();
       const stopLinePoint = fractionalPointAlongLine(
         this.btvThresholdPosition[0],
@@ -700,17 +669,17 @@ export class BrakeToVacateUtils<T extends number> {
     aircraftBearing: number,
     runwayFeatures: FeatureCollection<Geometry, AmdbProperties>,
   ): void {
-    // Only update every 10 position update, computation is around 4ms
+    // Only update every 10th position update, computation is around 4ms
     this.skip++;
     if (this.skip % 10 !== 0) {
       return;
     }
 
     if (
-      this.aircraftOnGround.get() === false ||
-      this.groundSpeed.ssm !== Arinc429SignStatusMatrix.NormalOperation ||
-      this.groundSpeed.value > 40 ||
-      this.groundSpeed.value < 1
+      this.onGround.get() === false ||
+      this.groundSpeed.get().ssm !== Arinc429SignStatusMatrix.NormalOperation ||
+      this.groundSpeed.get().value > 40 ||
+      this.groundSpeed.get().value < 1
     ) {
       // Transmit no advisory
       this.rwyAheadArinc.ssm = Arinc429SignStatusMatrix.NormalOperation;
@@ -724,7 +693,7 @@ export class BrakeToVacateUtils<T extends number> {
     // Warn 7s before entering the runway area: Draw area from aircraft nose to 7s in front of aircraft (with a/c width), check if intersects with runway geometry
     // Only available with AMDB data atm, i.e. Navigraph sub
     const distNose = 73 / 2 / MathUtils.METRES_TO_NAUTICAL_MILES;
-    const dist7Sec = (this.groundSpeed.value / 60 / 60) * 7 + distNose; // Add distance to aircraft front
+    const dist7Sec = (this.groundSpeed.get().value / 60 / 60) * 7 + distNose; // Add distance to aircraft front
     const nosePosition = placeBearingDistance(globalPos, aircraftBearing, distNose);
     const predictionHorizon = placeBearingDistance(globalPos, aircraftBearing, dist7Sec);
     const line = lineString([
diff --git a/fbw-common/src/systems/instruments/src/OANC/index.ts b/fbw-common/src/systems/instruments/src/OANC/index.ts
index 0186e89c9e7..ea107af72df 100644
--- a/fbw-common/src/systems/instruments/src/OANC/index.ts
+++ b/fbw-common/src/systems/instruments/src/OANC/index.ts
@@ -1,5 +1,5 @@
 export * from './api/NavigraphAmdbClient';
-export * from './BrakeToVacateUtils';
+export * from './OansBrakeToVacateSelection';
 export * from './Oanc';
 export * from './OancControlPanelUtils';
 export * from './OancMapUtils';
diff --git a/fbw-common/src/systems/shared/src/publishers/OansBtv/BtvPublisher.ts b/fbw-common/src/systems/shared/src/publishers/OansBtv/BtvPublisher.ts
index 50e0703d72e..f01542edbb0 100644
--- a/fbw-common/src/systems/shared/src/publishers/OansBtv/BtvPublisher.ts
+++ b/fbw-common/src/systems/shared/src/publishers/OansBtv/BtvPublisher.ts
@@ -15,12 +15,24 @@ export interface BtvData {
   dryStoppingDistance: number;
   /** (BTV -> OANS) Wet stopping distance */
   wetStoppingDistance: number;
-  /** (PRIM -> OANS) Remaining stop distance on ground, used for ROP */
+  /** (BTV -> OANS) Remaining stop distance on ground, used for ROP */
   stopBarDistance: number;
 
   radioAltitude_1: number;
   radioAltitude_2: number;
   radioAltitude_3: number;
+
+  groundSpeed_1: number;
+  groundSpeed_2: number;
+  groundSpeed_3: number;
+
+  lgciuDiscreteWord2_1: number;
+  lgciuDiscreteWord2_2: number;
+
+  verticalSpeed_1: number;
+  verticalSpeed_2: number;
+  verticalSpeed_3: number;
+
   fwcFlightPhase: number;
 }
 
@@ -34,6 +46,14 @@ export enum BtvSimVars {
   radioAltitude_1 = 'L:A32NX_RA_1_RADIO_ALTITUDE',
   radioAltitude_2 = 'L:A32NX_RA_2_RADIO_ALTITUDE',
   radioAltitude_3 = 'L:A32NX_RA_3_RADIO_ALTITUDE',
+  groundSpeed_1 = 'L:A32NX_ADIRS_IR_1_GROUND_SPEED',
+  groundSpeed_2 = 'L:A32NX_ADIRS_IR_2_GROUND_SPEED',
+  groundSpeed_3 = 'L:A32NX_ADIRS_IR_3_GROUND_SPEED',
+  lgciuDiscreteWord2_1 = 'L:A32NX_LGCIU_1_DISCRETE_WORD_2',
+  lgciuDiscreteWord2_2 = 'L:A32NX_LGCIU_2_DISCRETE_WORD_2',
+  verticalSpeed_1 = 'L:A32NX_ADIRS_IR_1_VERTICAL_SPEED',
+  verticalSpeed_2 = 'L:A32NX_ADIRS_IR_2_VERTICAL_SPEED',
+  verticalSpeed_3 = 'L:A32NX_ADIRS_IR_3_VERTICAL_SPEED',
   fwcFlightPhase = 'L:A32NX_FWC_FLIGHT_PHASE',
 }
 
@@ -48,6 +68,14 @@ export class BtvSimvarPublisher extends SimVarPublisher<BtvData> {
     ['radioAltitude_1', { name: BtvSimVars.radioAltitude_1, type: SimVarValueType.Number }],
     ['radioAltitude_2', { name: BtvSimVars.radioAltitude_2, type: SimVarValueType.Number }],
     ['radioAltitude_3', { name: BtvSimVars.radioAltitude_3, type: SimVarValueType.Number }],
+    ['groundSpeed_1', { name: BtvSimVars.groundSpeed_1, type: SimVarValueType.Number }],
+    ['groundSpeed_2', { name: BtvSimVars.groundSpeed_2, type: SimVarValueType.Number }],
+    ['groundSpeed_3', { name: BtvSimVars.groundSpeed_3, type: SimVarValueType.Number }],
+    ['lgciuDiscreteWord2_1', { name: BtvSimVars.lgciuDiscreteWord2_1, type: SimVarValueType.Number }],
+    ['lgciuDiscreteWord2_2', { name: BtvSimVars.lgciuDiscreteWord2_2, type: SimVarValueType.Number }],
+    ['verticalSpeed_1', { name: BtvSimVars.verticalSpeed_1, type: SimVarValueType.Number }],
+    ['verticalSpeed_2', { name: BtvSimVars.verticalSpeed_2, type: SimVarValueType.Number }],
+    ['verticalSpeed_3', { name: BtvSimVars.verticalSpeed_3, type: SimVarValueType.Number }],
     ['fwcFlightPhase', { name: BtvSimVars.fwcFlightPhase, type: SimVarValueType.Enum }],
   ]);
 
diff --git a/fbw-common/src/systems/shared/src/publishers/OansBtv/FmsOansPublisher.ts b/fbw-common/src/systems/shared/src/publishers/OansBtv/FmsOansPublisher.ts
index f0f8231f027..316cb85bc10 100644
--- a/fbw-common/src/systems/shared/src/publishers/OansBtv/FmsOansPublisher.ts
+++ b/fbw-common/src/systems/shared/src/publishers/OansBtv/FmsOansPublisher.ts
@@ -3,6 +3,7 @@
 
 import { ArincEventBus } from '@flybywiresim/fbw-sdk';
 import { SimVarPublisher, SimVarDefinition, SimVarValueType } from '@microsoft/msfs-sdk';
+import { Position } from '@turf/turf';
 
 /**
  * Transmitted from FMS to OANS
@@ -34,6 +35,14 @@ export interface FmsOansData {
   oansRemainingDistToRwyEnd: number;
   /** (OANS -> BTV) Arinc429: Distance to requested stopping distance, in meters. */
   oansRemainingDistToExit: number;
+
+  /** (OANS -> BTV) Projected position, i.e. aircraft position in airport local coordinates */
+  oansAirportLocalCoordinates: Position;
+  /** (OANS -> BTV) Positions of threshold and opposite threshold after selection of runway. WGS-84. */
+  oansThresholdPositions: Position[];
+  /** (OANS -> BTV) Position of exit after selection of exit. WGS-84. */
+  oansExitPosition: Position;
+
   /** (BTV -> OANS) Estimated runway occupancy time (ROT), in seconds. */
   btvRot: number;
   /** (BTV -> OANS) Arinc429: Estimated turnaround time, when using idle reverse during deceleration, in minutes. */
diff --git a/fbw-common/src/wasm/systems/systems/src/hydraulic/flap_slat.rs b/fbw-common/src/wasm/systems/systems/src/hydraulic/flap_slat.rs
index 7afc6fe4925..2994e78b75f 100644
--- a/fbw-common/src/wasm/systems/systems/src/hydraulic/flap_slat.rs
+++ b/fbw-common/src/wasm/systems/systems/src/hydraulic/flap_slat.rs
@@ -124,8 +124,12 @@ impl Actuator for FlapSlatHydraulicMotor {
 pub struct FlapSlatAssembly {
     position_left_percent_id: VariableIdentifier,
     position_right_percent_id: VariableIdentifier,
+
     angle_left_id: VariableIdentifier,
     angle_right_id: VariableIdentifier,
+
+    animation_left_id: VariableIdentifier,
+    animation_right_id: VariableIdentifier,
     is_moving_id: VariableIdentifier,
 
     surface_control_arm_position: Angle,
@@ -183,6 +187,9 @@ impl FlapSlatAssembly {
             angle_left_id: context.get_identifier(format!("LEFT_{}_ANGLE", id)),
             angle_right_id: context.get_identifier(format!("RIGHT_{}_ANGLE", id)),
 
+            animation_left_id: context.get_identifier(format!("LEFT_{}_ANIMATION_POSITION", id)),
+            animation_right_id: context.get_identifier(format!("RIGHT_{}_ANIMATION_POSITION", id)),
+
             is_moving_id: context.get_identifier(format!("IS_{}_MOVING", id)),
 
             surface_control_arm_position: Angle::new::<radian>(0.),
@@ -532,6 +539,11 @@ impl SimulationElement for FlapSlatAssembly {
         writer.write(&self.angle_left_id, flaps_surface_angle.get::<degree>());
         writer.write(&self.angle_right_id, flaps_surface_angle.get::<degree>());
 
+        let flaps_fppu_percent =
+            (self.position_feedback() / self.max_synchro_gear_position).get::<percent>();
+        writer.write(&self.animation_left_id, flaps_fppu_percent);
+        writer.write(&self.animation_right_id, flaps_fppu_percent);
+
         writer.write(&self.is_moving_id, self.is_surface_moving());
     }
 }