diff --git a/generated/canned-tunes/COUPE-BK1-comparing-against-current-COUPE-BK1-default.md b/generated/canned-tunes/COUPE-BK1-comparing-against-current-COUPE-BK1-default.md
index c30f486..d785359 100644
--- a/generated/canned-tunes/COUPE-BK1-comparing-against-current-COUPE-BK1-default.md
+++ b/generated/canned-tunes/COUPE-BK1-comparing-against-current-COUPE-BK1-default.md
@@ -12,14 +12,6 @@
     // default 354.19
     engineConfiguration->injector.flow = 440;
     // default 0.0
-    engineConfiguration->cylinderBankSelect[0] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[1] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[2] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[3] = 1;
-    // default 0.0
     engineConfiguration->cylinderBankSelect[4] = 1;
     // default 0.0
     engineConfiguration->cylinderBankSelect[5] = 1;
diff --git a/generated/canned-tunes/COUPE-BK1-comparing-against-global-defaults.md b/generated/canned-tunes/COUPE-BK1-comparing-against-global-defaults.md
index 9e77348..757fd32 100644
--- a/generated/canned-tunes/COUPE-BK1-comparing-against-global-defaults.md
+++ b/generated/canned-tunes/COUPE-BK1-comparing-against-global-defaults.md
@@ -20,14 +20,6 @@
     // default 300.0
     engineConfiguration->fuelReferencePressure = 379.2116;
     // default 0.0
-    engineConfiguration->cylinderBankSelect[0] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[1] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[2] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[3] = 1;
-    // default 0.0
     engineConfiguration->cylinderBankSelect[4] = 1;
     // default 0.0
     engineConfiguration->cylinderBankSelect[5] = 1;
diff --git a/generated/canned-tunes/COUPE-BK2-comparing-against-current-COUPE-BK2-default.md b/generated/canned-tunes/COUPE-BK2-comparing-against-current-COUPE-BK2-default.md
index dd5f81c..3bb5031 100644
--- a/generated/canned-tunes/COUPE-BK2-comparing-against-current-COUPE-BK2-default.md
+++ b/generated/canned-tunes/COUPE-BK2-comparing-against-current-COUPE-BK2-default.md
@@ -3,14 +3,6 @@
 // canned tune https://rusefi.com/online/view.php?msq=1507
 
 ```
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[0] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[1] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[2] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[3] = 1;
     // default 0.0
     engineConfiguration->cylinderBankSelect[4] = 1;
     // default 0.0
diff --git a/generated/canned-tunes/COUPE-BK2-comparing-against-global-defaults.md b/generated/canned-tunes/COUPE-BK2-comparing-against-global-defaults.md
index bb2c05e..6431a67 100644
--- a/generated/canned-tunes/COUPE-BK2-comparing-against-global-defaults.md
+++ b/generated/canned-tunes/COUPE-BK2-comparing-against-global-defaults.md
@@ -22,14 +22,6 @@
     // default 300.0
     engineConfiguration->fuelReferencePressure = 586.0544;
     // default 0.0
-    engineConfiguration->cylinderBankSelect[0] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[1] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[2] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[3] = 1;
-    // default 0.0
     engineConfiguration->cylinderBankSelect[4] = 1;
     // default 0.0
     engineConfiguration->cylinderBankSelect[5] = 1;
diff --git a/generated/canned-tunes/Honda-OBD1-comparing-against-current-Honda-OBD1-default.md b/generated/canned-tunes/Honda-OBD1-comparing-against-current-Honda-OBD1-default.md
index a60c55a..627a2de 100644
--- a/generated/canned-tunes/Honda-OBD1-comparing-against-current-Honda-OBD1-default.md
+++ b/generated/canned-tunes/Honda-OBD1-comparing-against-current-Honda-OBD1-default.md
@@ -16,14 +16,6 @@
     // default 248.0
     engineConfiguration->injector.flow = 240;
     // default 0.0
-    engineConfiguration->cylinderBankSelect[0] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[1] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[2] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[3] = 1;
-    // default 0.0
     engineConfiguration->cylinderBankSelect[4] = 1;
     // default 0.0
     engineConfiguration->cylinderBankSelect[5] = 1;
diff --git a/generated/canned-tunes/Honda-OBD1-comparing-against-global-defaults.md b/generated/canned-tunes/Honda-OBD1-comparing-against-global-defaults.md
index 99c4f91..584d20a 100644
--- a/generated/canned-tunes/Honda-OBD1-comparing-against-global-defaults.md
+++ b/generated/canned-tunes/Honda-OBD1-comparing-against-global-defaults.md
@@ -22,14 +22,6 @@
     // default 300.0
     engineConfiguration->fuelReferencePressure = 294;
     // default 0.0
-    engineConfiguration->cylinderBankSelect[0] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[1] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[2] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[3] = 1;
-    // default 0.0
     engineConfiguration->cylinderBankSelect[4] = 1;
     // default 0.0
     engineConfiguration->cylinderBankSelect[5] = 1;
diff --git a/generated/canned-tunes/M52-comparing-against-current-M52-default.md b/generated/canned-tunes/M52-comparing-against-current-M52-default.md
index f7cfe0f..05f9e24 100644
--- a/generated/canned-tunes/M52-comparing-against-current-M52-default.md
+++ b/generated/canned-tunes/M52-comparing-against-current-M52-default.md
@@ -34,14 +34,6 @@
     // default 300.0
     engineConfiguration->fuelReferencePressure = 100;
     // default 0.0
-    engineConfiguration->cylinderBankSelect[0] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[1] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[2] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[3] = 1;
-    // default 0.0
     engineConfiguration->cylinderBankSelect[4] = 1;
     // default 0.0
     engineConfiguration->cylinderBankSelect[5] = 1;
diff --git a/generated/canned-tunes/M52-comparing-against-global-defaults.md b/generated/canned-tunes/M52-comparing-against-global-defaults.md
index c9067e1..a2f32cb 100644
--- a/generated/canned-tunes/M52-comparing-against-global-defaults.md
+++ b/generated/canned-tunes/M52-comparing-against-global-defaults.md
@@ -40,14 +40,6 @@
     // default 300.0
     engineConfiguration->fuelReferencePressure = 100;
     // default 0.0
-    engineConfiguration->cylinderBankSelect[0] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[1] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[2] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[3] = 1;
-    // default 0.0
     engineConfiguration->cylinderBankSelect[4] = 1;
     // default 0.0
     engineConfiguration->cylinderBankSelect[5] = 1;
diff --git a/generated/canned-tunes/MazdaMiataNB2-comparing-against-current-MazdaMiataNB2-default.md b/generated/canned-tunes/MazdaMiataNB2-comparing-against-current-MazdaMiataNB2-default.md
index cb6562e..3c8757b 100644
--- a/generated/canned-tunes/MazdaMiataNB2-comparing-against-current-MazdaMiataNB2-default.md
+++ b/generated/canned-tunes/MazdaMiataNB2-comparing-against-current-MazdaMiataNB2-default.md
@@ -16,14 +16,6 @@
     // default 98.0
     engineConfiguration->vvtOffsets[0] = 76;
     // default 0.0
-    engineConfiguration->cylinderBankSelect[0] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[1] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[2] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[3] = 1;
-    // default 0.0
     engineConfiguration->cylinderBankSelect[4] = 1;
     // default 0.0
     engineConfiguration->cylinderBankSelect[5] = 1;
diff --git a/generated/canned-tunes/MazdaMiataNB2-comparing-against-global-defaults.md b/generated/canned-tunes/MazdaMiataNB2-comparing-against-global-defaults.md
index 3758dad..ce3a3d1 100644
--- a/generated/canned-tunes/MazdaMiataNB2-comparing-against-global-defaults.md
+++ b/generated/canned-tunes/MazdaMiataNB2-comparing-against-global-defaults.md
@@ -26,14 +26,6 @@
     // default 300.0
     engineConfiguration->fuelReferencePressure = 400;
     // default 0.0
-    engineConfiguration->cylinderBankSelect[0] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[1] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[2] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[3] = 1;
-    // default 0.0
     engineConfiguration->cylinderBankSelect[4] = 1;
     // default 0.0
     engineConfiguration->cylinderBankSelect[5] = 1;
diff --git a/generated/canned-tunes/PB-comparing-against-current-PB-default.md b/generated/canned-tunes/PB-comparing-against-current-PB-default.md
index f7d7753..2356b93 100644
--- a/generated/canned-tunes/PB-comparing-against-current-PB-default.md
+++ b/generated/canned-tunes/PB-comparing-against-current-PB-default.md
@@ -10,14 +10,6 @@
     // default 1214.0
     engineConfiguration->injector.flow = 1000;
     // default 0.0
-    engineConfiguration->cylinderBankSelect[0] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[1] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[2] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[3] = 1;
-    // default 0.0
     engineConfiguration->cylinderBankSelect[4] = 1;
     // default 0.0
     engineConfiguration->cylinderBankSelect[5] = 1;
diff --git a/generated/canned-tunes/PB-comparing-against-global-defaults.md b/generated/canned-tunes/PB-comparing-against-global-defaults.md
index 1e1a05a..d33a976 100644
--- a/generated/canned-tunes/PB-comparing-against-global-defaults.md
+++ b/generated/canned-tunes/PB-comparing-against-global-defaults.md
@@ -26,14 +26,6 @@
     // default 300.0
     engineConfiguration->fuelReferencePressure = 10000;
     // default 0.0
-    engineConfiguration->cylinderBankSelect[0] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[1] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[2] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[3] = 1;
-    // default 0.0
     engineConfiguration->cylinderBankSelect[4] = 1;
     // default 0.0
     engineConfiguration->cylinderBankSelect[5] = 1;
diff --git a/generated/canned-tunes/m111-alex-comparing-against-current-m111-alex-default.md b/generated/canned-tunes/m111-alex-comparing-against-current-m111-alex-default.md
index e2b0393..8bfd8d4 100644
--- a/generated/canned-tunes/m111-alex-comparing-against-current-m111-alex-default.md
+++ b/generated/canned-tunes/m111-alex-comparing-against-current-m111-alex-default.md
@@ -28,14 +28,6 @@
     // default 300.0
     engineConfiguration->fuelReferencePressure = 0;
     // default 0.0
-    engineConfiguration->cylinderBankSelect[0] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[1] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[2] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[3] = 1;
-    // default 0.0
     engineConfiguration->cylinderBankSelect[4] = 1;
     // default 0.0
     engineConfiguration->cylinderBankSelect[5] = 1;
diff --git a/generated/canned-tunes/m111-alex-comparing-against-global-defaults.md b/generated/canned-tunes/m111-alex-comparing-against-global-defaults.md
index 7ed12d4..f4de758 100644
--- a/generated/canned-tunes/m111-alex-comparing-against-global-defaults.md
+++ b/generated/canned-tunes/m111-alex-comparing-against-global-defaults.md
@@ -28,14 +28,6 @@
     // default 300.0
     engineConfiguration->fuelReferencePressure = 0;
     // default 0.0
-    engineConfiguration->cylinderBankSelect[0] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[1] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[2] = 1;
-    // default 0.0
-    engineConfiguration->cylinderBankSelect[3] = 1;
-    // default 0.0
     engineConfiguration->cylinderBankSelect[4] = 1;
     // default 0.0
     engineConfiguration->cylinderBankSelect[5] = 1;
diff --git a/generated/simulator_tune.msq b/generated/simulator_tune.msq
index f023356..017dd75 100644
--- a/generated/simulator_tune.msq
+++ b/generated/simulator_tune.msq
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <msq xmlns="http://www.msefi.com/:msq">
     <page/>
-    <page number="0" size="22428">
+    <page number="0" size="22400">
         <constant name="engineType">"MINIMAL_PINS"</constant>
         <constant digits="0" name="startButtonSuppressOnStartUpMs" units="">0.0</constant>
         <constant digits="0" name="sensorSnifferRpmThreshold" units="RPM">2500.0</constant>
@@ -12,26 +12,25 @@
         <constant digits="0" name="maxAcRpm" units="rpm">5000.0</constant>
         <constant digits="0" name="maxAcTps" units="%">75.0</constant>
         <constant digits="0" name="maxAcClt" units="deg C">100.0</constant>
-        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
-         650.0
-         800.0
-         1100.0
-         1400.0
-         1700.0
-         2000.0
-         2300.0
-         2600.0
-         2900.0
-         3200.0
-         3500.0
-         3800.0
-         4100.0
-         4400.0
-         4700.0
-         7000.0
-</constant>
+        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
+        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
+        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
+        <constant name="mainRelayPin">"NONE"</constant>
+        <constant name="sdCardCsPin">"NONE"</constant>
+        <constant name="canTxPin">"NONE"</constant>
+        <constant name="canRxPin">"NONE"</constant>
+        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
+        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
+        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
+        <constant name="tachOutputPin">"NONE"</constant>
+        <constant name="tachOutputPinMode">"default"</constant>
+        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
+        <constant digits="0" name="manIdlePosition" units="%">50.0</constant>
         <constant digits="0" name="multisparkMaxSparkingAngle" units="deg">30.0</constant>
         <constant digits="0" name="multisparkMaxExtraSparkCount" units="count">2.0</constant>
+        <constant digits="0" name="vvtControlMinRpm" units="RPM">550.0</constant>
         <constant digits="2" name="injector_flow" units="cm3/min">200.0</constant>
         <constant cols="1" digits="2" name="injector_battLagCorrBins" rows="8">
          6.0
@@ -182,6 +181,7 @@
         <constant digits="0" name="triggerSimulatorRpm" units="RPM">1200.0</constant>
         <constant digits="0" name="cylindersCount" units="">4.0</constant>
         <constant name="firingOrder">"1-3-4-2"</constant>
+        <constant digits="0" name="justATempTest" units="">0.0</constant>
         <constant name="communityCommsLedPid">"NONE"</constant>
         <constant digits="2" name="cylinderBore" units="mm">87.5</constant>
         <constant name="fuelAlgorithm">"Speed Density"</constant>
@@ -195,8 +195,10 @@
         <constant name="ignitionMode">"Single Coil"</constant>
         <constant digits="0" name="gapTrackingLengthOverride" units="count">0.0</constant>
         <constant digits="0" name="maxIdleVss" units="kph">0.0</constant>
+        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
         <constant digits="0" name="minOilPressureAfterStart" units="kPa">0.0</constant>
         <constant name="timingMode">"dynamic"</constant>
+        <constant name="canNbcType">"None"</constant>
         <constant digits="0" name="fixedModeTiming" units="RPM">50.0</constant>
         <constant digits="0" name="globalTriggerAngleOffset" units="deg btdc">0.0</constant>
         <constant digits="2" name="analogInputDividerCoefficient" units="coef">2.0</constant>
@@ -205,13 +207,8 @@
         <constant digits="0" name="fanOffTemperature" units="deg C">88.0</constant>
         <constant name="acrPin">"NONE"</constant>
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">1000.0</constant>
-        <constant name="canNbcType">"None"</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
-        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
-        <constant digits="0" name="justATempTest" units="">0.0</constant>
-        <constant digits="0" name="unusedHere333" units="">0.0</constant>
-        <constant digits="0" name="unusedHere334" units="">0.0</constant>
-        <constant digits="0" name="byFirmwareVersion" units="index">2.0240319E7</constant>
+        <constant digits="0" name="byFirmwareVersion" units="index">2.0240322E7</constant>
         <constant name="tps1_1AdcChannel">"Disabled"</constant>
         <constant name="vbattAdcChannel">"Disabled"</constant>
         <constant name="fuelLevelSensor">"Disabled"</constant>
@@ -226,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.0240319E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240322E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -254,12 +251,12 @@
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
         <constant name="idle_stepperStepPin">"NONE"</constant>
         <constant name="idle_solenoidPinMode">"default"</constant>
-        <constant digits="0" name="manIdlePosition" units="%">50.0</constant>
         <constant digits="1" name="knockRetardAggression" units="%">20.0</constant>
         <constant digits="1" name="knockRetardReapplyRate" units="deg/s">3.0</constant>
         <constant name="engineSyncCam">"Intake First Bank"</constant>
-        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
+        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="3" name="vssGearRatio" units="ratio">3.73</constant>
+        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
         <constant digits="0" name="vssToothCount" units="count">21.0</constant>
         <constant name="idleVeOverrideMode">"None"</constant>
         <constant name="l9779_cs">"NONE"</constant>
@@ -308,22 +305,13 @@
         <constant name="max31855spiDevice">"Off"</constant>
         <constant name="debugTriggerSync">"NONE"</constant>
         <constant name="digitalPotentiometerSpiDevice">"Off"</constant>
+        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
         <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
         <constant name="tps1_2AdcChannel">"Disabled"</constant>
         <constant name="tps2_2AdcChannel">"Disabled"</constant>
         <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
-        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -331,23 +319,10 @@
         <constant name="triggerInputPins2">"NONE"</constant>
         <constant digits="0" name="mc33_t_min_boost" units="us">100.0</constant>
         <constant name="hip9011CsPinMode">"default"</constant>
-        <constant name="tachOutputPin">"NONE"</constant>
-        <constant name="tachOutputPinMode">"default"</constant>
-        <constant name="mainRelayPin">"NONE"</constant>
-        <constant name="sdCardCsPin">"NONE"</constant>
-        <constant name="canTxPin">"NONE"</constant>
-        <constant name="canRxPin">"NONE"</constant>
         <constant name="throttlePedalUpPinMode">"DEFAULT"</constant>
-        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
         <constant digits="2" name="finalGearRatio" units="ratio">1.0</constant>
         <constant name="tcuInputSpeedSensorPin">"NONE"</constant>
         <constant digits="0" name="tcuInputSpeedSensorTeeth" units="">1.0</constant>
-        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
-        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
         <constant name="triggerSimulatorPins1">"NONE"</constant>
         <constant name="triggerSimulatorPins2">"NONE"</constant>
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
@@ -403,27 +378,7 @@
         <constant name="acFanPin">"NONE"</constant>
         <constant name="acFanPinMode">"default"</constant>
         <constant name="l9779spiDevice">"Off"</constant>
-        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         14.0
-         15.0
-</constant>
         <constant name="imuType">"None"</constant>
-        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="vehicleWeight" units="kg">0.0</constant>
         <constant digits="0" name="idlePidRpmUpperLimit" units="RPM">300.0</constant>
         <constant digits="3" name="applyNonlinearBelowPulse" units="ms">0.0</constant>
@@ -454,6 +409,8 @@
         <constant name="starterRelayDisablePinMode">"default"</constant>
         <constant name="secondSolenoidPin">"NONE"</constant>
         <constant name="startStopButtonPin">"NONE"</constant>
+        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
+        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="0" name="mapMinBufferLength" units="count">1.0</constant>
         <constant digits="0" name="idlePidDeactivationTpsThreshold" units="%">5.0</constant>
         <constant digits="0" name="stepperParkingExtraSteps" units="%">0.0</constant>
@@ -466,8 +423,6 @@
         <constant name="acRelayPin">"NONE"</constant>
         <constant digits="0" name="lambdaProtectionMinTps" units="%">50.0</constant>
         <constant digits="1" name="lambdaProtectionTimeout" units="s">0.5</constant>
-        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
-        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="2" name="scriptSetting1" units="">0.0</constant>
         <constant digits="2" name="scriptSetting2" units="">0.0</constant>
         <constant digits="2" name="scriptSetting3" units="">0.0</constant>
@@ -546,6 +501,8 @@
         <constant digits="0" name="boostPwmFrequency" units="Hz">33.0</constant>
         <constant name="launchActivationMode">"Launch Button"</constant>
         <constant name="antiLagActivationMode">"Switch Input"</constant>
+        <constant digits="2" name="tpsAccelLookback" units="sec">0.0</constant>
+        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="0" name="launchSpeedThreshold" units="Kph">30.0</constant>
         <constant digits="0" name="launchRpmWindow" units="RPM">500.0</constant>
         <constant digits="0" name="launchSparkSkipPercent" units="%">0.0</constant>
@@ -594,16 +551,6 @@
         <constant name="drv8860_cs">"NONE"</constant>
         <constant name="drv8860_csPinMode">"default"</constant>
         <constant name="drv8860_miso">"NONE"</constant>
-        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
-         0.0
-         0.71
-         1.43
-         2.14
-         2.86
-         3.57
-         4.29
-         5.0
-</constant>
         <constant name="luaOutputPins1">"NONE"</constant>
         <constant name="luaOutputPins2">"NONE"</constant>
         <constant name="luaOutputPins3">"NONE"</constant>
@@ -809,10 +756,8 @@
         <constant name="auxSerialTxPin">"NONE"</constant>
         <constant name="auxSerialRxPin">"NONE"</constant>
         <constant name="accelerometerCsPin">"NONE"</constant>
-        <constant digits="2" name="tpsAccelLookback" units="sec">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssLow" units="kph">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssHigh" units="kph">0.0</constant>
-        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="1" name="tpsAccelEnrichmentThreshold" units="roc">40.0</constant>
         <constant name="auxSpeedSensorInputPin1">"NONE"</constant>
         <constant name="auxSpeedSensorInputPin2">"NONE"</constant>
@@ -901,7 +846,6 @@
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
-        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="0" name="crankingIACposition" units="percent">50.0</constant>
         <constant digits="4" name="tChargeMinRpmMinTps" units="">0.25</constant>
         <constant digits="4" name="tChargeMinRpmMaxTps" units="">0.25</constant>
@@ -1019,7 +963,6 @@
         <constant name="mc33816_rstb">"NONE"</constant>
         <constant name="mc33816_driven">"NONE"</constant>
         <constant name="brakePedalPin">"NONE"</constant>
-        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant digits="4" name="auxPid1_pFactor" units="">2.0</constant>
         <constant digits="4" name="auxPid1_iFactor" units="">0.005</constant>
         <constant digits="4" name="auxPid1_dFactor" units="">0.0</constant>
@@ -1066,12 +1009,7 @@
         <constant name="tle8888_csPinMode">"default"</constant>
         <constant name="mc33816_cs">"NONE"</constant>
         <constant digits="1" name="auxFrequencyFilter" units="hz">0.0</constant>
-        <constant digits="0" name="vvtControlMinRpm" units="RPM">550.0</constant>
         <constant name="sentInputPins1">"NONE"</constant>
-        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
-        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
-        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
-        <constant digits="0" name="unused645646" units="">0.0</constant>
         <constant digits="0" name="coastingFuelCutRpmHigh" units="rpm">1500.0</constant>
         <constant digits="0" name="coastingFuelCutRpmLow" units="rpm">1300.0</constant>
         <constant digits="0" name="coastingFuelCutTps" units="%">2.0</constant>
@@ -1088,24 +1026,11 @@
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value2" units="">0.0</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
-         -20.0
-         0.0
-         40.0
-         80.0
-</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant digits="3" name="tChargeAirCoefMin" units="">0.098</constant>
         <constant digits="3" name="tChargeAirCoefMax" units="">0.902</constant>
         <constant digits="1" name="tChargeAirFlowMax" units="kg/h">153.6</constant>
         <constant digits="1" name="tChargeAirIncrLimit" units="deg/sec">1.0</constant>
         <constant digits="1" name="tChargeAirDecrLimit" units="deg/sec">12.5</constant>
-        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="2" name="hip9011Gain" units="">1.0</constant>
         <constant digits="0" name="etb_iTermMin" units="">-30.0</constant>
         <constant digits="0" name="etb_iTermMax" units="">30.0</constant>
@@ -1127,10 +1052,10 @@
         <constant digits="1" name="stoichRatioPrimary" units=":1">14.7</constant>
         <constant digits="0" name="idlerpmpid_iTermMax" units="">20.0</constant>
         <constant digits="0" name="etbIdleThrottleRange" units="%">15.0</constant>
-        <constant digits="0" name="cylinderBankSelect1" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect2" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect3" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect4" units="">0.0</constant>
+        <constant digits="0" name="cylinderBankSelect1" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect2" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect3" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect4" units="">1.0</constant>
         <constant digits="0" name="cylinderBankSelect5" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect6" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect7" units="">0.0</constant>
@@ -1338,24 +1263,6 @@
         <constant name="tcu_solenoid_mode4">"default"</constant>
         <constant name="tcu_solenoid_mode5">"default"</constant>
         <constant name="tcu_solenoid_mode6">"default"</constant>
-        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-</constant>
         <constant digits="3" name="triggerGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom2" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom3" units="ratio">0.0</constant>
@@ -1395,13 +1302,8 @@
         <constant digits="0" name="maxCamPhaseResolveRpm" units="rpm">0.0</constant>
         <constant digits="1" name="dfcoDelay" units="sec">0.0</constant>
         <constant digits="1" name="acDelay" units="sec">0.5</constant>
+        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="3" name="fordInjectorSmallPulseBreakPoint" units="mg">0.0</constant>
-        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="etbJamIntegratorLimit" units="%">0.0</constant>
         <constant digits="0" name="hpfpCamLobes" units="lobes/cam">3.0</constant>
         <constant name="hpfpCam">"NONE"</constant>
@@ -1413,134 +1315,6 @@
         <constant digits="3" name="hpfpPidP" units="%/kPa">0.01</constant>
         <constant digits="5" name="hpfpPidI" units="%/kPa/lobe">3.0E-4</constant>
         <constant digits="0" name="hpfpTargetDecay" units="kPa/s">2000.0</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
-         0.0
-         1.0
-         4.5
-         9.5
-         16.5
-         25.0
-         34.5
-         45.0
-         55.0
-         65.5
-         75.0
-         83.5
-         90.5
-         95.5
-         99.0
-         100.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
-         0.0
-         7.5
-         16.5
-         24.0
-         32.0
-         40.0
-         48.0
-         56.0
-         64.0
-         72.0
-         80.0
-         88.0
-         96.0
-         103.5
-         112.5
-         120.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         15.0
-         16.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-         120.0
-         140.0
-         160.0
-         180.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
-         0.005
-         0.018
-         0.031
-         0.043
-         0.056
-         0.069
-         0.082
-         0.094
-         0.107
-         0.12
-</constant>
-        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
         <constant name="stepper_raw_output1">"NONE"</constant>
         <constant name="stepper_raw_output2">"NONE"</constant>
         <constant name="stepper_raw_output3">"NONE"</constant>
@@ -1556,66 +1330,6 @@
         <constant digits="2" name="gearRatio9" units="ratio">0.0</constant>
         <constant digits="2" name="gearRatio10" units="ratio">0.0</constant>
         <constant digits="0" name="vvtActivationDelayMs" units="ms">6000.0</constant>
-        <constant cols="1" digits="0" name="wwCltBins" rows="8">
-         -40.0
-         -20.0
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
-         1.45
-         1.3
-         1.17
-         1.05
-         0.9
-         0.82
-         0.75
-         0.7
-</constant>
-        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
-         0.73
-         0.66
-         0.57
-         0.46
-         0.38
-         0.31
-         0.24
-         0.19
-</constant>
-        <constant cols="1" digits="0" name="wwMapBins" rows="8">
-         10.0
-         20.0
-         30.0
-         40.0
-         50.0
-         60.0
-         70.0
-         80.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
-         0.38
-         0.55
-         0.69
-         0.86
-         0.9
-         0.95
-         0.97
-         1.0
-</constant>
-        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
-         0.21
-         0.4
-         0.6
-         0.79
-         0.85
-         0.9
-         0.95
-         1.0
-</constant>
         <constant cols="6" digits="0" name="torqueTable" rows="6">
          0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0
@@ -1701,7 +1415,6 @@
          0.0
          0.0
 </constant>
-        <constant digits="0" name="unused3124141" units="">0.0</constant>
         <constant name="fuelPressureSensorMode">"Absolute"</constant>
         <constant name="luaDigitalInputPins1">"NONE"</constant>
         <constant name="luaDigitalInputPins2">"NONE"</constant>
@@ -1711,12 +1424,6 @@
         <constant name="luaDigitalInputPins6">"NONE"</constant>
         <constant name="luaDigitalInputPins7">"NONE"</constant>
         <constant name="luaDigitalInputPins8">"NONE"</constant>
-        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
-         650.0
-         800.0
-         3750.0
-         7000.0
-</constant>
         <constant digits="0" name="ALSMinRPM" units="rpm">400.0</constant>
         <constant digits="0" name="ALSMaxRPM" units="rpm">3200.0</constant>
         <constant digits="0" name="ALSMaxDuration" units="sec">3.0</constant>
@@ -1892,7 +1599,124 @@
         <constant name="spi5MisoMode">"default"</constant>
         <constant name="spi6SckMode">"default"</constant>
         <constant name="spi6MosiMode">"default"</constant>
-        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="120">
+        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
+        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="236">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
          0.0
          0.0
          0.0
@@ -2378,40 +2202,22 @@
          0.0
          0.0
 </constant>
-        <constant cols="1" digits="0" name="unusedGapInCalibration" rows="32">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
+        <constant digits="0" name="fancyOptions1" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions2" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions3" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions4" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions5" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions6" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions7" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions8" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions9" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions10" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions11" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions12" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions13" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions14" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions15" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions16" units="">0.0</constant>
         <constant cols="8" digits="1" name="boostTableOpenLoop" rows="8">
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
@@ -4552,9 +4358,297 @@ end</constant>
          3600.0
          5000.0
          7000.0
+</constant>
+        <constant cols="1" digits="0" name="wwCltBins" rows="8">
+         -40.0
+         -20.0
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
+         1.45
+         1.3
+         1.17
+         1.05
+         0.9
+         0.82
+         0.75
+         0.7
+</constant>
+        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
+         0.73
+         0.66
+         0.57
+         0.46
+         0.38
+         0.31
+         0.24
+         0.19
+</constant>
+        <constant cols="1" digits="0" name="wwMapBins" rows="8">
+         10.0
+         20.0
+         30.0
+         40.0
+         50.0
+         60.0
+         70.0
+         80.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
+         0.38
+         0.55
+         0.69
+         0.86
+         0.9
+         0.95
+         0.97
+         1.0
+</constant>
+        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
+         0.21
+         0.4
+         0.6
+         0.79
+         0.85
+         0.9
+         0.95
+         1.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
+         0.0
+         1.0
+         4.5
+         9.5
+         16.5
+         25.0
+         34.5
+         45.0
+         55.0
+         65.5
+         75.0
+         83.5
+         90.5
+         95.5
+         99.0
+         100.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
+         0.0
+         7.5
+         16.5
+         24.0
+         32.0
+         40.0
+         48.0
+         56.0
+         64.0
+         72.0
+         80.0
+         88.0
+         96.0
+         103.5
+         112.5
+         120.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         15.0
+         16.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+         120.0
+         140.0
+         160.0
+         180.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
+         0.005
+         0.018
+         0.031
+         0.043
+         0.056
+         0.069
+         0.082
+         0.094
+         0.107
+         0.12
+</constant>
+        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
+         650.0
+         800.0
+         1100.0
+         1400.0
+         1700.0
+         2000.0
+         2300.0
+         2600.0
+         2900.0
+         3200.0
+         3500.0
+         3800.0
+         4100.0
+         4400.0
+         4700.0
+         7000.0
+</constant>
+        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+</constant>
+        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
+         650.0
+         800.0
+         3750.0
+         7000.0
+</constant>
+        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
+         1.0
+         1.0
+         1.0
+         1.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
+         -20.0
+         0.0
+         40.0
+         80.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
+         0.0
+         0.71
+         1.43
+         2.14
+         2.86
+         3.57
+         4.29
+         5.0
+</constant>
+        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         14.0
+         15.0
+</constant>
+        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.19.XXX.4275859823" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.22.XXX.4019883890" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_BMW_M52.msq b/generated/simulator_tune_BMW_M52.msq
index 1a49365..3cb60ca 100644
--- a/generated/simulator_tune_BMW_M52.msq
+++ b/generated/simulator_tune_BMW_M52.msq
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <msq xmlns="http://www.msefi.com/:msq">
     <page/>
-    <page number="0" size="22428">
+    <page number="0" size="22400">
         <constant name="engineType">"BMW_M52"</constant>
         <constant digits="0" name="startButtonSuppressOnStartUpMs" units="">0.0</constant>
         <constant digits="0" name="sensorSnifferRpmThreshold" units="RPM">2500.0</constant>
@@ -12,26 +12,25 @@
         <constant digits="0" name="maxAcRpm" units="rpm">5000.0</constant>
         <constant digits="0" name="maxAcTps" units="%">75.0</constant>
         <constant digits="0" name="maxAcClt" units="deg C">100.0</constant>
-        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
-         650.0
-         800.0
-         1100.0
-         1400.0
-         1700.0
-         2000.0
-         2300.0
-         2600.0
-         2900.0
-         3200.0
-         3500.0
-         3800.0
-         4100.0
-         4400.0
-         4700.0
-         7000.0
-</constant>
+        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
+        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
+        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
+        <constant name="mainRelayPin">"NONE"</constant>
+        <constant name="sdCardCsPin">"NONE"</constant>
+        <constant name="canTxPin">"NONE"</constant>
+        <constant name="canRxPin">"NONE"</constant>
+        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
+        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
+        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
+        <constant name="tachOutputPin">"NONE"</constant>
+        <constant name="tachOutputPinMode">"default"</constant>
+        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
+        <constant digits="0" name="manIdlePosition" units="%">50.0</constant>
         <constant digits="0" name="multisparkMaxSparkingAngle" units="deg">30.0</constant>
         <constant digits="0" name="multisparkMaxExtraSparkCount" units="count">2.0</constant>
+        <constant digits="0" name="vvtControlMinRpm" units="RPM">500.0</constant>
         <constant digits="2" name="injector_flow" units="cm3/min">200.0</constant>
         <constant cols="1" digits="2" name="injector_battLagCorrBins" rows="8">
          6.0
@@ -182,6 +181,7 @@
         <constant digits="0" name="triggerSimulatorRpm" units="RPM">1200.0</constant>
         <constant digits="0" name="cylindersCount" units="">6.0</constant>
         <constant name="firingOrder">"1-3-4-2"</constant>
+        <constant digits="0" name="justATempTest" units="">0.0</constant>
         <constant name="communityCommsLedPid">"NONE"</constant>
         <constant digits="2" name="cylinderBore" units="mm">87.5</constant>
         <constant name="fuelAlgorithm">"Speed Density"</constant>
@@ -195,8 +195,10 @@
         <constant name="ignitionMode">"Wasted Spark"</constant>
         <constant digits="0" name="gapTrackingLengthOverride" units="count">0.0</constant>
         <constant digits="0" name="maxIdleVss" units="kph">0.0</constant>
+        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
         <constant digits="0" name="minOilPressureAfterStart" units="kPa">0.0</constant>
         <constant name="timingMode">"dynamic"</constant>
+        <constant name="canNbcType">"None"</constant>
         <constant digits="0" name="fixedModeTiming" units="RPM">50.0</constant>
         <constant digits="0" name="globalTriggerAngleOffset" units="deg btdc">0.0</constant>
         <constant digits="2" name="analogInputDividerCoefficient" units="coef">2.0</constant>
@@ -205,12 +207,7 @@
         <constant digits="0" name="fanOffTemperature" units="deg C">88.0</constant>
         <constant name="acrPin">"NONE"</constant>
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">1000.0</constant>
-        <constant name="canNbcType">"None"</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
-        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
-        <constant digits="0" name="justATempTest" units="">0.0</constant>
-        <constant digits="0" name="unusedHere333" units="">0.0</constant>
-        <constant digits="0" name="unusedHere334" units="">0.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
         <constant name="tps1_1AdcChannel">"Disabled"</constant>
         <constant name="vbattAdcChannel">"Disabled"</constant>
@@ -226,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.0240319E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240322E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -254,12 +251,12 @@
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
         <constant name="idle_stepperStepPin">"NONE"</constant>
         <constant name="idle_solenoidPinMode">"default"</constant>
-        <constant digits="0" name="manIdlePosition" units="%">50.0</constant>
         <constant digits="1" name="knockRetardAggression" units="%">20.0</constant>
         <constant digits="1" name="knockRetardReapplyRate" units="deg/s">3.0</constant>
         <constant name="engineSyncCam">"Intake First Bank"</constant>
-        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
+        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="3" name="vssGearRatio" units="ratio">3.73</constant>
+        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
         <constant digits="0" name="vssToothCount" units="count">21.0</constant>
         <constant name="idleVeOverrideMode">"None"</constant>
         <constant name="l9779_cs">"NONE"</constant>
@@ -308,22 +305,13 @@
         <constant name="max31855spiDevice">"Off"</constant>
         <constant name="debugTriggerSync">"NONE"</constant>
         <constant name="digitalPotentiometerSpiDevice">"Off"</constant>
+        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
         <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
         <constant name="tps1_2AdcChannel">"Disabled"</constant>
         <constant name="tps2_2AdcChannel">"Disabled"</constant>
         <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
-        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -331,23 +319,10 @@
         <constant name="triggerInputPins2">"NONE"</constant>
         <constant digits="0" name="mc33_t_min_boost" units="us">100.0</constant>
         <constant name="hip9011CsPinMode">"default"</constant>
-        <constant name="tachOutputPin">"NONE"</constant>
-        <constant name="tachOutputPinMode">"default"</constant>
-        <constant name="mainRelayPin">"NONE"</constant>
-        <constant name="sdCardCsPin">"NONE"</constant>
-        <constant name="canTxPin">"NONE"</constant>
-        <constant name="canRxPin">"NONE"</constant>
         <constant name="throttlePedalUpPinMode">"DEFAULT"</constant>
-        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
         <constant digits="2" name="finalGearRatio" units="ratio">1.0</constant>
         <constant name="tcuInputSpeedSensorPin">"NONE"</constant>
         <constant digits="0" name="tcuInputSpeedSensorTeeth" units="">1.0</constant>
-        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
-        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
         <constant name="triggerSimulatorPins1">"NONE"</constant>
         <constant name="triggerSimulatorPins2">"NONE"</constant>
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
@@ -403,27 +378,7 @@
         <constant name="acFanPin">"NONE"</constant>
         <constant name="acFanPinMode">"default"</constant>
         <constant name="l9779spiDevice">"Off"</constant>
-        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         14.0
-         15.0
-</constant>
         <constant name="imuType">"None"</constant>
-        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="vehicleWeight" units="kg">0.0</constant>
         <constant digits="0" name="idlePidRpmUpperLimit" units="RPM">300.0</constant>
         <constant digits="3" name="applyNonlinearBelowPulse" units="ms">0.0</constant>
@@ -454,6 +409,8 @@
         <constant name="starterRelayDisablePinMode">"default"</constant>
         <constant name="secondSolenoidPin">"NONE"</constant>
         <constant name="startStopButtonPin">"NONE"</constant>
+        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
+        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="0" name="mapMinBufferLength" units="count">1.0</constant>
         <constant digits="0" name="idlePidDeactivationTpsThreshold" units="%">5.0</constant>
         <constant digits="0" name="stepperParkingExtraSteps" units="%">0.0</constant>
@@ -466,8 +423,6 @@
         <constant name="acRelayPin">"NONE"</constant>
         <constant digits="0" name="lambdaProtectionMinTps" units="%">50.0</constant>
         <constant digits="1" name="lambdaProtectionTimeout" units="s">0.5</constant>
-        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
-        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="2" name="scriptSetting1" units="">0.0</constant>
         <constant digits="2" name="scriptSetting2" units="">0.0</constant>
         <constant digits="2" name="scriptSetting3" units="">0.0</constant>
@@ -546,6 +501,8 @@
         <constant digits="0" name="boostPwmFrequency" units="Hz">33.0</constant>
         <constant name="launchActivationMode">"Launch Button"</constant>
         <constant name="antiLagActivationMode">"Switch Input"</constant>
+        <constant digits="2" name="tpsAccelLookback" units="sec">0.0</constant>
+        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="0" name="launchSpeedThreshold" units="Kph">30.0</constant>
         <constant digits="0" name="launchRpmWindow" units="RPM">500.0</constant>
         <constant digits="0" name="launchSparkSkipPercent" units="%">0.0</constant>
@@ -594,16 +551,6 @@
         <constant name="drv8860_cs">"NONE"</constant>
         <constant name="drv8860_csPinMode">"default"</constant>
         <constant name="drv8860_miso">"NONE"</constant>
-        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
-         0.0
-         0.71
-         1.43
-         2.14
-         2.86
-         3.57
-         4.29
-         5.0
-</constant>
         <constant name="luaOutputPins1">"NONE"</constant>
         <constant name="luaOutputPins2">"NONE"</constant>
         <constant name="luaOutputPins3">"NONE"</constant>
@@ -809,10 +756,8 @@
         <constant name="auxSerialTxPin">"NONE"</constant>
         <constant name="auxSerialRxPin">"NONE"</constant>
         <constant name="accelerometerCsPin">"NONE"</constant>
-        <constant digits="2" name="tpsAccelLookback" units="sec">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssLow" units="kph">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssHigh" units="kph">0.0</constant>
-        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="1" name="tpsAccelEnrichmentThreshold" units="roc">40.0</constant>
         <constant name="auxSpeedSensorInputPin1">"NONE"</constant>
         <constant name="auxSpeedSensorInputPin2">"NONE"</constant>
@@ -901,7 +846,6 @@
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
-        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="0" name="crankingIACposition" units="percent">50.0</constant>
         <constant digits="4" name="tChargeMinRpmMinTps" units="">0.25</constant>
         <constant digits="4" name="tChargeMinRpmMaxTps" units="">0.25</constant>
@@ -1019,7 +963,6 @@
         <constant name="mc33816_rstb">"NONE"</constant>
         <constant name="mc33816_driven">"NONE"</constant>
         <constant name="brakePedalPin">"NONE"</constant>
-        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant digits="4" name="auxPid1_pFactor" units="">2.0</constant>
         <constant digits="4" name="auxPid1_iFactor" units="">0.005</constant>
         <constant digits="4" name="auxPid1_dFactor" units="">0.0</constant>
@@ -1066,12 +1009,7 @@
         <constant name="tle8888_csPinMode">"default"</constant>
         <constant name="mc33816_cs">"NONE"</constant>
         <constant digits="1" name="auxFrequencyFilter" units="hz">0.0</constant>
-        <constant digits="0" name="vvtControlMinRpm" units="RPM">500.0</constant>
         <constant name="sentInputPins1">"NONE"</constant>
-        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
-        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
-        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
-        <constant digits="0" name="unused645646" units="">0.0</constant>
         <constant digits="0" name="coastingFuelCutRpmHigh" units="rpm">1500.0</constant>
         <constant digits="0" name="coastingFuelCutRpmLow" units="rpm">1300.0</constant>
         <constant digits="0" name="coastingFuelCutTps" units="%">2.0</constant>
@@ -1088,24 +1026,11 @@
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value2" units="">0.0</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
-         -20.0
-         0.0
-         40.0
-         80.0
-</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant digits="3" name="tChargeAirCoefMin" units="">0.098</constant>
         <constant digits="3" name="tChargeAirCoefMax" units="">0.902</constant>
         <constant digits="1" name="tChargeAirFlowMax" units="kg/h">153.6</constant>
         <constant digits="1" name="tChargeAirIncrLimit" units="deg/sec">1.0</constant>
         <constant digits="1" name="tChargeAirDecrLimit" units="deg/sec">12.5</constant>
-        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="2" name="hip9011Gain" units="">1.0</constant>
         <constant digits="0" name="etb_iTermMin" units="">-30.0</constant>
         <constant digits="0" name="etb_iTermMax" units="">30.0</constant>
@@ -1127,10 +1052,10 @@
         <constant digits="1" name="stoichRatioPrimary" units=":1">14.7</constant>
         <constant digits="0" name="idlerpmpid_iTermMax" units="">20.0</constant>
         <constant digits="0" name="etbIdleThrottleRange" units="%">15.0</constant>
-        <constant digits="0" name="cylinderBankSelect1" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect2" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect3" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect4" units="">0.0</constant>
+        <constant digits="0" name="cylinderBankSelect1" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect2" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect3" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect4" units="">1.0</constant>
         <constant digits="0" name="cylinderBankSelect5" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect6" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect7" units="">0.0</constant>
@@ -1338,24 +1263,6 @@
         <constant name="tcu_solenoid_mode4">"default"</constant>
         <constant name="tcu_solenoid_mode5">"default"</constant>
         <constant name="tcu_solenoid_mode6">"default"</constant>
-        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-</constant>
         <constant digits="3" name="triggerGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom2" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom3" units="ratio">0.0</constant>
@@ -1395,13 +1302,8 @@
         <constant digits="0" name="maxCamPhaseResolveRpm" units="rpm">0.0</constant>
         <constant digits="1" name="dfcoDelay" units="sec">0.0</constant>
         <constant digits="1" name="acDelay" units="sec">0.5</constant>
+        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="3" name="fordInjectorSmallPulseBreakPoint" units="mg">0.0</constant>
-        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="etbJamIntegratorLimit" units="%">0.0</constant>
         <constant digits="0" name="hpfpCamLobes" units="lobes/cam">3.0</constant>
         <constant name="hpfpCam">"NONE"</constant>
@@ -1413,134 +1315,6 @@
         <constant digits="3" name="hpfpPidP" units="%/kPa">0.01</constant>
         <constant digits="5" name="hpfpPidI" units="%/kPa/lobe">3.0E-4</constant>
         <constant digits="0" name="hpfpTargetDecay" units="kPa/s">2000.0</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
-         0.0
-         1.0
-         4.5
-         9.5
-         16.5
-         25.0
-         34.5
-         45.0
-         55.0
-         65.5
-         75.0
-         83.5
-         90.5
-         95.5
-         99.0
-         100.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
-         0.0
-         7.5
-         16.5
-         24.0
-         32.0
-         40.0
-         48.0
-         56.0
-         64.0
-         72.0
-         80.0
-         88.0
-         96.0
-         103.5
-         112.5
-         120.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         15.0
-         16.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-         120.0
-         140.0
-         160.0
-         180.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
-         0.005
-         0.018
-         0.031
-         0.043
-         0.056
-         0.069
-         0.082
-         0.094
-         0.107
-         0.12
-</constant>
-        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
         <constant name="stepper_raw_output1">"NONE"</constant>
         <constant name="stepper_raw_output2">"NONE"</constant>
         <constant name="stepper_raw_output3">"NONE"</constant>
@@ -1556,66 +1330,6 @@
         <constant digits="2" name="gearRatio9" units="ratio">0.0</constant>
         <constant digits="2" name="gearRatio10" units="ratio">0.0</constant>
         <constant digits="0" name="vvtActivationDelayMs" units="ms">6000.0</constant>
-        <constant cols="1" digits="0" name="wwCltBins" rows="8">
-         -40.0
-         -20.0
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
-         1.45
-         1.3
-         1.17
-         1.05
-         0.9
-         0.82
-         0.75
-         0.7
-</constant>
-        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
-         0.73
-         0.66
-         0.57
-         0.46
-         0.38
-         0.31
-         0.24
-         0.19
-</constant>
-        <constant cols="1" digits="0" name="wwMapBins" rows="8">
-         10.0
-         20.0
-         30.0
-         40.0
-         50.0
-         60.0
-         70.0
-         80.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
-         0.38
-         0.55
-         0.69
-         0.86
-         0.9
-         0.95
-         0.97
-         1.0
-</constant>
-        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
-         0.21
-         0.4
-         0.6
-         0.79
-         0.85
-         0.9
-         0.95
-         1.0
-</constant>
         <constant cols="6" digits="0" name="torqueTable" rows="6">
          0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0
@@ -1701,7 +1415,6 @@
          0.0
          0.0
 </constant>
-        <constant digits="0" name="unused3124141" units="">0.0</constant>
         <constant name="fuelPressureSensorMode">"Absolute"</constant>
         <constant name="luaDigitalInputPins1">"NONE"</constant>
         <constant name="luaDigitalInputPins2">"NONE"</constant>
@@ -1711,12 +1424,6 @@
         <constant name="luaDigitalInputPins6">"NONE"</constant>
         <constant name="luaDigitalInputPins7">"NONE"</constant>
         <constant name="luaDigitalInputPins8">"NONE"</constant>
-        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
-         650.0
-         800.0
-         3750.0
-         7000.0
-</constant>
         <constant digits="0" name="ALSMinRPM" units="rpm">400.0</constant>
         <constant digits="0" name="ALSMaxRPM" units="rpm">3200.0</constant>
         <constant digits="0" name="ALSMaxDuration" units="sec">3.0</constant>
@@ -1892,7 +1599,124 @@
         <constant name="spi5MisoMode">"default"</constant>
         <constant name="spi6SckMode">"default"</constant>
         <constant name="spi6MosiMode">"default"</constant>
-        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="120">
+        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
+        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="236">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
          0.0
          0.0
          0.0
@@ -2378,40 +2202,22 @@
          0.0
          0.0
 </constant>
-        <constant cols="1" digits="0" name="unusedGapInCalibration" rows="32">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
+        <constant digits="0" name="fancyOptions1" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions2" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions3" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions4" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions5" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions6" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions7" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions8" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions9" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions10" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions11" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions12" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions13" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions14" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions15" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions16" units="">0.0</constant>
         <constant cols="8" digits="1" name="boostTableOpenLoop" rows="8">
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
@@ -4552,9 +4358,297 @@ end</constant>
          3600.0
          5000.0
          7000.0
+</constant>
+        <constant cols="1" digits="0" name="wwCltBins" rows="8">
+         -40.0
+         -20.0
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
+         1.45
+         1.3
+         1.17
+         1.05
+         0.9
+         0.82
+         0.75
+         0.7
+</constant>
+        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
+         0.73
+         0.66
+         0.57
+         0.46
+         0.38
+         0.31
+         0.24
+         0.19
+</constant>
+        <constant cols="1" digits="0" name="wwMapBins" rows="8">
+         10.0
+         20.0
+         30.0
+         40.0
+         50.0
+         60.0
+         70.0
+         80.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
+         0.38
+         0.55
+         0.69
+         0.86
+         0.9
+         0.95
+         0.97
+         1.0
+</constant>
+        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
+         0.21
+         0.4
+         0.6
+         0.79
+         0.85
+         0.9
+         0.95
+         1.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
+         0.0
+         1.0
+         4.5
+         9.5
+         16.5
+         25.0
+         34.5
+         45.0
+         55.0
+         65.5
+         75.0
+         83.5
+         90.5
+         95.5
+         99.0
+         100.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
+         0.0
+         7.5
+         16.5
+         24.0
+         32.0
+         40.0
+         48.0
+         56.0
+         64.0
+         72.0
+         80.0
+         88.0
+         96.0
+         103.5
+         112.5
+         120.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         15.0
+         16.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+         120.0
+         140.0
+         160.0
+         180.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
+         0.005
+         0.018
+         0.031
+         0.043
+         0.056
+         0.069
+         0.082
+         0.094
+         0.107
+         0.12
+</constant>
+        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
+         650.0
+         800.0
+         1100.0
+         1400.0
+         1700.0
+         2000.0
+         2300.0
+         2600.0
+         2900.0
+         3200.0
+         3500.0
+         3800.0
+         4100.0
+         4400.0
+         4700.0
+         7000.0
+</constant>
+        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+</constant>
+        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
+         650.0
+         800.0
+         3750.0
+         7000.0
+</constant>
+        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
+         1.0
+         1.0
+         1.0
+         1.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
+         -20.0
+         0.0
+         40.0
+         80.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
+         0.0
+         0.71
+         1.43
+         2.14
+         2.86
+         3.57
+         4.29
+         5.0
+</constant>
+        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         14.0
+         15.0
+</constant>
+        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.19.XXX.4275859823" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.22.XXX.4019883890" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_HARLEY.msq b/generated/simulator_tune_HARLEY.msq
index 6993256..e82cad5 100644
--- a/generated/simulator_tune_HARLEY.msq
+++ b/generated/simulator_tune_HARLEY.msq
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <msq xmlns="http://www.msefi.com/:msq">
     <page/>
-    <page number="0" size="22428">
+    <page number="0" size="22400">
         <constant name="engineType">"HARLEY"</constant>
         <constant digits="0" name="startButtonSuppressOnStartUpMs" units="">0.0</constant>
         <constant digits="0" name="sensorSnifferRpmThreshold" units="RPM">2500.0</constant>
@@ -12,26 +12,25 @@
         <constant digits="0" name="maxAcRpm" units="rpm">5000.0</constant>
         <constant digits="0" name="maxAcTps" units="%">75.0</constant>
         <constant digits="0" name="maxAcClt" units="deg C">100.0</constant>
-        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
-         650.0
-         800.0
-         1100.0
-         1400.0
-         1700.0
-         2000.0
-         2300.0
-         2600.0
-         2900.0
-         3200.0
-         3500.0
-         3800.0
-         4100.0
-         4400.0
-         4700.0
-         7000.0
-</constant>
+        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
+        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
+        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
+        <constant name="mainRelayPin">"NONE"</constant>
+        <constant name="sdCardCsPin">"NONE"</constant>
+        <constant name="canTxPin">"NONE"</constant>
+        <constant name="canRxPin">"NONE"</constant>
+        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
+        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
+        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
+        <constant name="tachOutputPin">"NONE"</constant>
+        <constant name="tachOutputPinMode">"default"</constant>
+        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
+        <constant digits="0" name="manIdlePosition" units="%">50.0</constant>
         <constant digits="0" name="multisparkMaxSparkingAngle" units="deg">30.0</constant>
         <constant digits="0" name="multisparkMaxExtraSparkCount" units="count">2.0</constant>
+        <constant digits="0" name="vvtControlMinRpm" units="RPM">500.0</constant>
         <constant digits="2" name="injector_flow" units="cm3/min">200.0</constant>
         <constant cols="1" digits="2" name="injector_battLagCorrBins" rows="8">
          6.0
@@ -182,6 +181,7 @@
         <constant digits="0" name="triggerSimulatorRpm" units="RPM">1200.0</constant>
         <constant digits="0" name="cylindersCount" units="">2.0</constant>
         <constant name="firingOrder">"1-2"</constant>
+        <constant digits="0" name="justATempTest" units="">0.0</constant>
         <constant name="communityCommsLedPid">"NONE"</constant>
         <constant digits="2" name="cylinderBore" units="mm">87.5</constant>
         <constant name="fuelAlgorithm">"Speed Density"</constant>
@@ -195,8 +195,10 @@
         <constant name="ignitionMode">"Individual Coils"</constant>
         <constant digits="0" name="gapTrackingLengthOverride" units="count">0.0</constant>
         <constant digits="0" name="maxIdleVss" units="kph">0.0</constant>
+        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
         <constant digits="0" name="minOilPressureAfterStart" units="kPa">0.0</constant>
         <constant name="timingMode">"dynamic"</constant>
+        <constant name="canNbcType">"None"</constant>
         <constant digits="0" name="fixedModeTiming" units="RPM">50.0</constant>
         <constant digits="0" name="globalTriggerAngleOffset" units="deg btdc">0.0</constant>
         <constant digits="2" name="analogInputDividerCoefficient" units="coef">2.0</constant>
@@ -205,12 +207,7 @@
         <constant digits="0" name="fanOffTemperature" units="deg C">88.0</constant>
         <constant name="acrPin">"PG6"</constant>
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">1000.0</constant>
-        <constant name="canNbcType">"None"</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
-        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
-        <constant digits="0" name="justATempTest" units="">0.0</constant>
-        <constant digits="0" name="unusedHere333" units="">0.0</constant>
-        <constant digits="0" name="unusedHere334" units="">0.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
         <constant name="tps1_1AdcChannel">"PC1"</constant>
         <constant name="vbattAdcChannel">"Disabled"</constant>
@@ -226,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.0240319E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240322E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">50.0</constant>
         <constant name="camInputs1">"PE12"</constant>
@@ -254,12 +251,12 @@
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
         <constant name="idle_stepperStepPin">"NONE"</constant>
         <constant name="idle_solenoidPinMode">"default"</constant>
-        <constant digits="0" name="manIdlePosition" units="%">50.0</constant>
         <constant digits="1" name="knockRetardAggression" units="%">20.0</constant>
         <constant digits="1" name="knockRetardReapplyRate" units="deg/s">3.0</constant>
         <constant name="engineSyncCam">"Intake First Bank"</constant>
-        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
+        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="3" name="vssGearRatio" units="ratio">3.73</constant>
+        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
         <constant digits="0" name="vssToothCount" units="count">21.0</constant>
         <constant name="idleVeOverrideMode">"None"</constant>
         <constant name="l9779_cs">"NONE"</constant>
@@ -308,22 +305,13 @@
         <constant name="max31855spiDevice">"Off"</constant>
         <constant name="debugTriggerSync">"NONE"</constant>
         <constant name="digitalPotentiometerSpiDevice">"Off"</constant>
+        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
         <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
         <constant name="tps1_2AdcChannel">"PC2"</constant>
         <constant name="tps2_2AdcChannel">"Disabled"</constant>
         <constant name="throttlePedalPositionSecondAdcChannel">"PA0"</constant>
-        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -331,23 +319,10 @@
         <constant name="triggerInputPins2">"NONE"</constant>
         <constant digits="0" name="mc33_t_min_boost" units="us">100.0</constant>
         <constant name="hip9011CsPinMode">"default"</constant>
-        <constant name="tachOutputPin">"NONE"</constant>
-        <constant name="tachOutputPinMode">"default"</constant>
-        <constant name="mainRelayPin">"NONE"</constant>
-        <constant name="sdCardCsPin">"NONE"</constant>
-        <constant name="canTxPin">"NONE"</constant>
-        <constant name="canRxPin">"NONE"</constant>
         <constant name="throttlePedalUpPinMode">"DEFAULT"</constant>
-        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
         <constant digits="2" name="finalGearRatio" units="ratio">1.0</constant>
         <constant name="tcuInputSpeedSensorPin">"NONE"</constant>
         <constant digits="0" name="tcuInputSpeedSensorTeeth" units="">1.0</constant>
-        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
-        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
         <constant name="triggerSimulatorPins1">"NONE"</constant>
         <constant name="triggerSimulatorPins2">"NONE"</constant>
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
@@ -403,27 +378,7 @@
         <constant name="acFanPin">"NONE"</constant>
         <constant name="acFanPinMode">"default"</constant>
         <constant name="l9779spiDevice">"Off"</constant>
-        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         14.0
-         15.0
-</constant>
         <constant name="imuType">"None"</constant>
-        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="vehicleWeight" units="kg">0.0</constant>
         <constant digits="0" name="idlePidRpmUpperLimit" units="RPM">300.0</constant>
         <constant digits="3" name="applyNonlinearBelowPulse" units="ms">0.0</constant>
@@ -454,6 +409,8 @@
         <constant name="starterRelayDisablePinMode">"default"</constant>
         <constant name="secondSolenoidPin">"NONE"</constant>
         <constant name="startStopButtonPin">"NONE"</constant>
+        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
+        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="0" name="mapMinBufferLength" units="count">1.0</constant>
         <constant digits="0" name="idlePidDeactivationTpsThreshold" units="%">5.0</constant>
         <constant digits="0" name="stepperParkingExtraSteps" units="%">0.0</constant>
@@ -466,8 +423,6 @@
         <constant name="acRelayPin">"NONE"</constant>
         <constant digits="0" name="lambdaProtectionMinTps" units="%">50.0</constant>
         <constant digits="1" name="lambdaProtectionTimeout" units="s">0.5</constant>
-        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
-        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="2" name="scriptSetting1" units="">300.0</constant>
         <constant digits="2" name="scriptSetting2" units="">5000.0</constant>
         <constant digits="2" name="scriptSetting3" units="">0.0</constant>
@@ -546,6 +501,8 @@
         <constant digits="0" name="boostPwmFrequency" units="Hz">33.0</constant>
         <constant name="launchActivationMode">"Launch Button"</constant>
         <constant name="antiLagActivationMode">"Switch Input"</constant>
+        <constant digits="2" name="tpsAccelLookback" units="sec">0.0</constant>
+        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="0" name="launchSpeedThreshold" units="Kph">30.0</constant>
         <constant digits="0" name="launchRpmWindow" units="RPM">500.0</constant>
         <constant digits="0" name="launchSparkSkipPercent" units="%">0.0</constant>
@@ -595,16 +552,6 @@
         <constant name="drv8860_cs">"NONE"</constant>
         <constant name="drv8860_csPinMode">"default"</constant>
         <constant name="drv8860_miso">"NONE"</constant>
-        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
-         0.0
-         0.71
-         1.43
-         2.14
-         2.86
-         3.57
-         4.29
-         5.0
-</constant>
         <constant name="luaOutputPins1">"PB8"</constant>
         <constant name="luaOutputPins2">"NONE"</constant>
         <constant name="luaOutputPins3">"NONE"</constant>
@@ -810,10 +757,8 @@
         <constant name="auxSerialTxPin">"NONE"</constant>
         <constant name="auxSerialRxPin">"NONE"</constant>
         <constant name="accelerometerCsPin">"NONE"</constant>
-        <constant digits="2" name="tpsAccelLookback" units="sec">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssLow" units="kph">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssHigh" units="kph">0.0</constant>
-        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="1" name="tpsAccelEnrichmentThreshold" units="roc">40.0</constant>
         <constant name="auxSpeedSensorInputPin1">"NONE"</constant>
         <constant name="auxSpeedSensorInputPin2">"NONE"</constant>
@@ -902,7 +847,6 @@
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
-        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="0" name="crankingIACposition" units="percent">50.0</constant>
         <constant digits="4" name="tChargeMinRpmMinTps" units="">0.25</constant>
         <constant digits="4" name="tChargeMinRpmMaxTps" units="">0.25</constant>
@@ -1020,7 +964,6 @@
         <constant name="mc33816_rstb">"NONE"</constant>
         <constant name="mc33816_driven">"NONE"</constant>
         <constant name="brakePedalPin">"NONE"</constant>
-        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant digits="4" name="auxPid1_pFactor" units="">2.0</constant>
         <constant digits="4" name="auxPid1_iFactor" units="">0.005</constant>
         <constant digits="4" name="auxPid1_dFactor" units="">0.0</constant>
@@ -1067,12 +1010,7 @@
         <constant name="tle8888_csPinMode">"default"</constant>
         <constant name="mc33816_cs">"NONE"</constant>
         <constant digits="1" name="auxFrequencyFilter" units="hz">0.0</constant>
-        <constant digits="0" name="vvtControlMinRpm" units="RPM">500.0</constant>
         <constant name="sentInputPins1">"NONE"</constant>
-        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
-        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
-        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
-        <constant digits="0" name="unused645646" units="">0.0</constant>
         <constant digits="0" name="coastingFuelCutRpmHigh" units="rpm">1500.0</constant>
         <constant digits="0" name="coastingFuelCutRpmLow" units="rpm">1300.0</constant>
         <constant digits="0" name="coastingFuelCutTps" units="%">2.0</constant>
@@ -1089,18 +1027,6 @@
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value2" units="">0.0</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
-         -20.0
-         0.0
-         40.0
-         80.0
-</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant name="scriptSettingName1">compReleaseRpm</constant>
         <constant name="scriptSettingName2">compReleaseDur</constant>
         <constant digits="3" name="tChargeAirCoefMin" units="">0.098</constant>
@@ -1108,7 +1034,6 @@
         <constant digits="1" name="tChargeAirFlowMax" units="kg/h">153.6</constant>
         <constant digits="1" name="tChargeAirIncrLimit" units="deg/sec">1.0</constant>
         <constant digits="1" name="tChargeAirDecrLimit" units="deg/sec">12.5</constant>
-        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="2" name="hip9011Gain" units="">1.0</constant>
         <constant digits="0" name="etb_iTermMin" units="">-30.0</constant>
         <constant digits="0" name="etb_iTermMax" units="">30.0</constant>
@@ -1130,10 +1055,10 @@
         <constant digits="1" name="stoichRatioPrimary" units=":1">14.7</constant>
         <constant digits="0" name="idlerpmpid_iTermMax" units="">20.0</constant>
         <constant digits="0" name="etbIdleThrottleRange" units="%">15.0</constant>
-        <constant digits="0" name="cylinderBankSelect1" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect2" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect3" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect4" units="">0.0</constant>
+        <constant digits="0" name="cylinderBankSelect1" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect2" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect3" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect4" units="">1.0</constant>
         <constant digits="0" name="cylinderBankSelect5" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect6" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect7" units="">0.0</constant>
@@ -1341,24 +1266,6 @@
         <constant name="tcu_solenoid_mode4">"default"</constant>
         <constant name="tcu_solenoid_mode5">"default"</constant>
         <constant name="tcu_solenoid_mode6">"default"</constant>
-        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-</constant>
         <constant digits="3" name="triggerGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom2" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom3" units="ratio">0.0</constant>
@@ -1398,13 +1305,8 @@
         <constant digits="0" name="maxCamPhaseResolveRpm" units="rpm">0.0</constant>
         <constant digits="1" name="dfcoDelay" units="sec">0.0</constant>
         <constant digits="1" name="acDelay" units="sec">0.5</constant>
+        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="3" name="fordInjectorSmallPulseBreakPoint" units="mg">0.0</constant>
-        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="etbJamIntegratorLimit" units="%">0.0</constant>
         <constant digits="0" name="hpfpCamLobes" units="lobes/cam">3.0</constant>
         <constant name="hpfpCam">"NONE"</constant>
@@ -1416,134 +1318,6 @@
         <constant digits="3" name="hpfpPidP" units="%/kPa">0.01</constant>
         <constant digits="5" name="hpfpPidI" units="%/kPa/lobe">3.0E-4</constant>
         <constant digits="0" name="hpfpTargetDecay" units="kPa/s">2000.0</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
-         0.0
-         1.0
-         4.5
-         9.5
-         16.5
-         25.0
-         34.5
-         45.0
-         55.0
-         65.5
-         75.0
-         83.5
-         90.5
-         95.5
-         99.0
-         100.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
-         0.0
-         7.5
-         16.5
-         24.0
-         32.0
-         40.0
-         48.0
-         56.0
-         64.0
-         72.0
-         80.0
-         88.0
-         96.0
-         103.5
-         112.5
-         120.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         15.0
-         16.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-         120.0
-         140.0
-         160.0
-         180.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
-         0.005
-         0.018
-         0.031
-         0.043
-         0.056
-         0.069
-         0.082
-         0.094
-         0.107
-         0.12
-</constant>
-        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
         <constant name="stepper_raw_output1">"NONE"</constant>
         <constant name="stepper_raw_output2">"NONE"</constant>
         <constant name="stepper_raw_output3">"NONE"</constant>
@@ -1559,66 +1333,6 @@
         <constant digits="2" name="gearRatio9" units="ratio">0.0</constant>
         <constant digits="2" name="gearRatio10" units="ratio">0.0</constant>
         <constant digits="0" name="vvtActivationDelayMs" units="ms">6000.0</constant>
-        <constant cols="1" digits="0" name="wwCltBins" rows="8">
-         -40.0
-         -20.0
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
-         1.45
-         1.3
-         1.17
-         1.05
-         0.9
-         0.82
-         0.75
-         0.7
-</constant>
-        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
-         0.73
-         0.66
-         0.57
-         0.46
-         0.38
-         0.31
-         0.24
-         0.19
-</constant>
-        <constant cols="1" digits="0" name="wwMapBins" rows="8">
-         10.0
-         20.0
-         30.0
-         40.0
-         50.0
-         60.0
-         70.0
-         80.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
-         0.38
-         0.55
-         0.69
-         0.86
-         0.9
-         0.95
-         0.97
-         1.0
-</constant>
-        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
-         0.21
-         0.4
-         0.6
-         0.79
-         0.85
-         0.9
-         0.95
-         1.0
-</constant>
         <constant cols="6" digits="0" name="torqueTable" rows="6">
          0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0
@@ -1704,7 +1418,6 @@
          0.0
          0.0
 </constant>
-        <constant digits="0" name="unused3124141" units="">0.0</constant>
         <constant name="fuelPressureSensorMode">"Absolute"</constant>
         <constant name="luaDigitalInputPins1">"NONE"</constant>
         <constant name="luaDigitalInputPins2">"NONE"</constant>
@@ -1714,12 +1427,6 @@
         <constant name="luaDigitalInputPins6">"NONE"</constant>
         <constant name="luaDigitalInputPins7">"NONE"</constant>
         <constant name="luaDigitalInputPins8">"NONE"</constant>
-        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
-         650.0
-         800.0
-         3750.0
-         7000.0
-</constant>
         <constant digits="0" name="ALSMinRPM" units="rpm">400.0</constant>
         <constant digits="0" name="ALSMaxRPM" units="rpm">3200.0</constant>
         <constant digits="0" name="ALSMaxDuration" units="sec">3.0</constant>
@@ -1895,7 +1602,124 @@
         <constant name="spi5MisoMode">"default"</constant>
         <constant name="spi6SckMode">"default"</constant>
         <constant name="spi6MosiMode">"default"</constant>
-        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="120">
+        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
+        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="236">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
          0.0
          0.0
          0.0
@@ -2381,40 +2205,22 @@
          0.0
          0.0
 </constant>
-        <constant cols="1" digits="0" name="unusedGapInCalibration" rows="32">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
+        <constant digits="0" name="fancyOptions1" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions2" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions3" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions4" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions5" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions6" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions7" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions8" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions9" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions10" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions11" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions12" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions13" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions14" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions15" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions16" units="">0.0</constant>
         <constant cols="8" digits="1" name="boostTableOpenLoop" rows="8">
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
@@ -4628,9 +4434,297 @@ end</constant>
          3600.0
          5000.0
          7000.0
+</constant>
+        <constant cols="1" digits="0" name="wwCltBins" rows="8">
+         -40.0
+         -20.0
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
+         1.45
+         1.3
+         1.17
+         1.05
+         0.9
+         0.82
+         0.75
+         0.7
+</constant>
+        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
+         0.73
+         0.66
+         0.57
+         0.46
+         0.38
+         0.31
+         0.24
+         0.19
+</constant>
+        <constant cols="1" digits="0" name="wwMapBins" rows="8">
+         10.0
+         20.0
+         30.0
+         40.0
+         50.0
+         60.0
+         70.0
+         80.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
+         0.38
+         0.55
+         0.69
+         0.86
+         0.9
+         0.95
+         0.97
+         1.0
+</constant>
+        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
+         0.21
+         0.4
+         0.6
+         0.79
+         0.85
+         0.9
+         0.95
+         1.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
+         0.0
+         1.0
+         4.5
+         9.5
+         16.5
+         25.0
+         34.5
+         45.0
+         55.0
+         65.5
+         75.0
+         83.5
+         90.5
+         95.5
+         99.0
+         100.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
+         0.0
+         7.5
+         16.5
+         24.0
+         32.0
+         40.0
+         48.0
+         56.0
+         64.0
+         72.0
+         80.0
+         88.0
+         96.0
+         103.5
+         112.5
+         120.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         15.0
+         16.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+         120.0
+         140.0
+         160.0
+         180.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
+         0.005
+         0.018
+         0.031
+         0.043
+         0.056
+         0.069
+         0.082
+         0.094
+         0.107
+         0.12
+</constant>
+        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
+         650.0
+         800.0
+         1100.0
+         1400.0
+         1700.0
+         2000.0
+         2300.0
+         2600.0
+         2900.0
+         3200.0
+         3500.0
+         3800.0
+         4100.0
+         4400.0
+         4700.0
+         7000.0
+</constant>
+        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+</constant>
+        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
+         650.0
+         800.0
+         3750.0
+         7000.0
+</constant>
+        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
+         1.0
+         1.0
+         1.0
+         1.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
+         -20.0
+         0.0
+         40.0
+         80.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
+         0.0
+         0.71
+         1.43
+         2.14
+         2.86
+         3.57
+         4.29
+         5.0
+</constant>
+        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         14.0
+         15.0
+</constant>
+        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.19.XXX.4275859823" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.22.XXX.4019883890" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK1.msq b/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK1.msq
index 77b2867..3c4ff4c 100644
--- a/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK1.msq
+++ b/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK1.msq
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <msq xmlns="http://www.msefi.com/:msq">
     <page/>
-    <page number="0" size="22428">
+    <page number="0" size="22400">
         <constant name="engineType">"HELLEN_154_HYUNDAI_COUPE_BK1"</constant>
         <constant digits="0" name="startButtonSuppressOnStartUpMs" units="">0.0</constant>
         <constant digits="0" name="sensorSnifferRpmThreshold" units="RPM">2500.0</constant>
@@ -12,26 +12,25 @@
         <constant digits="0" name="maxAcRpm" units="rpm">5000.0</constant>
         <constant digits="0" name="maxAcTps" units="%">75.0</constant>
         <constant digits="0" name="maxAcClt" units="deg C">100.0</constant>
-        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
-         650.0
-         800.0
-         1100.0
-         1400.0
-         1700.0
-         2000.0
-         2300.0
-         2600.0
-         2900.0
-         3200.0
-         3500.0
-         3800.0
-         4100.0
-         4400.0
-         4700.0
-         7000.0
-</constant>
+        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
+        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
+        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
+        <constant name="mainRelayPin">"NONE"</constant>
+        <constant name="sdCardCsPin">"NONE"</constant>
+        <constant name="canTxPin">"NONE"</constant>
+        <constant name="canRxPin">"NONE"</constant>
+        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
+        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
+        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
+        <constant name="tachOutputPin">"NONE"</constant>
+        <constant name="tachOutputPinMode">"default"</constant>
+        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
+        <constant digits="0" name="manIdlePosition" units="%">50.0</constant>
         <constant digits="0" name="multisparkMaxSparkingAngle" units="deg">30.0</constant>
         <constant digits="0" name="multisparkMaxExtraSparkCount" units="count">2.0</constant>
+        <constant digits="0" name="vvtControlMinRpm" units="RPM">1500.0</constant>
         <constant digits="2" name="injector_flow" units="cm3/min">354.19</constant>
         <constant cols="1" digits="2" name="injector_battLagCorrBins" rows="8">
          6.0
@@ -182,6 +181,7 @@
         <constant digits="0" name="triggerSimulatorRpm" units="RPM">1200.0</constant>
         <constant digits="0" name="cylindersCount" units="">4.0</constant>
         <constant name="firingOrder">"1-3-4-2"</constant>
+        <constant digits="0" name="justATempTest" units="">0.0</constant>
         <constant name="communityCommsLedPid">"NONE"</constant>
         <constant digits="2" name="cylinderBore" units="mm">87.5</constant>
         <constant name="fuelAlgorithm">"Speed Density"</constant>
@@ -195,8 +195,10 @@
         <constant name="ignitionMode">"Individual Coils"</constant>
         <constant digits="0" name="gapTrackingLengthOverride" units="count">0.0</constant>
         <constant digits="0" name="maxIdleVss" units="kph">0.0</constant>
+        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
         <constant digits="0" name="minOilPressureAfterStart" units="kPa">0.0</constant>
         <constant name="timingMode">"dynamic"</constant>
+        <constant name="canNbcType">"None"</constant>
         <constant digits="0" name="fixedModeTiming" units="RPM">50.0</constant>
         <constant digits="0" name="globalTriggerAngleOffset" units="deg btdc">475.0</constant>
         <constant digits="2" name="analogInputDividerCoefficient" units="coef">2.0</constant>
@@ -205,12 +207,7 @@
         <constant digits="0" name="fanOffTemperature" units="deg C">75.0</constant>
         <constant name="acrPin">"NONE"</constant>
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">1000.0</constant>
-        <constant name="canNbcType">"None"</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
-        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
-        <constant digits="0" name="justATempTest" units="">0.0</constant>
-        <constant digits="0" name="unusedHere333" units="">0.0</constant>
-        <constant digits="0" name="unusedHere334" units="">0.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
         <constant name="tps1_1AdcChannel">"Disabled"</constant>
         <constant name="vbattAdcChannel">"Disabled"</constant>
@@ -226,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.0240319E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240322E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -254,12 +251,12 @@
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
         <constant name="idle_stepperStepPin">"NONE"</constant>
         <constant name="idle_solenoidPinMode">"default"</constant>
-        <constant digits="0" name="manIdlePosition" units="%">50.0</constant>
         <constant digits="1" name="knockRetardAggression" units="%">20.0</constant>
         <constant digits="1" name="knockRetardReapplyRate" units="deg/s">3.0</constant>
         <constant name="engineSyncCam">"Intake First Bank"</constant>
-        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
+        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="3" name="vssGearRatio" units="ratio">3.73</constant>
+        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
         <constant digits="0" name="vssToothCount" units="count">21.0</constant>
         <constant name="idleVeOverrideMode">"None"</constant>
         <constant name="l9779_cs">"NONE"</constant>
@@ -308,22 +305,13 @@
         <constant name="max31855spiDevice">"Off"</constant>
         <constant name="debugTriggerSync">"NONE"</constant>
         <constant name="digitalPotentiometerSpiDevice">"Off"</constant>
+        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
         <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
         <constant name="tps1_2AdcChannel">"Disabled"</constant>
         <constant name="tps2_2AdcChannel">"Disabled"</constant>
         <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
-        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -331,23 +319,10 @@
         <constant name="triggerInputPins2">"NONE"</constant>
         <constant digits="0" name="mc33_t_min_boost" units="us">100.0</constant>
         <constant name="hip9011CsPinMode">"default"</constant>
-        <constant name="tachOutputPin">"NONE"</constant>
-        <constant name="tachOutputPinMode">"default"</constant>
-        <constant name="mainRelayPin">"NONE"</constant>
-        <constant name="sdCardCsPin">"NONE"</constant>
-        <constant name="canTxPin">"NONE"</constant>
-        <constant name="canRxPin">"NONE"</constant>
         <constant name="throttlePedalUpPinMode">"DEFAULT"</constant>
-        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
         <constant digits="2" name="finalGearRatio" units="ratio">1.0</constant>
         <constant name="tcuInputSpeedSensorPin">"NONE"</constant>
         <constant digits="0" name="tcuInputSpeedSensorTeeth" units="">1.0</constant>
-        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
-        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
         <constant name="triggerSimulatorPins1">"NONE"</constant>
         <constant name="triggerSimulatorPins2">"NONE"</constant>
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
@@ -403,27 +378,7 @@
         <constant name="acFanPin">"NONE"</constant>
         <constant name="acFanPinMode">"default"</constant>
         <constant name="l9779spiDevice">"Off"</constant>
-        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         14.0
-         15.0
-</constant>
         <constant name="imuType">"None"</constant>
-        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="vehicleWeight" units="kg">0.0</constant>
         <constant digits="0" name="idlePidRpmUpperLimit" units="RPM">300.0</constant>
         <constant digits="3" name="applyNonlinearBelowPulse" units="ms">0.0</constant>
@@ -454,6 +409,8 @@
         <constant name="starterRelayDisablePinMode">"default"</constant>
         <constant name="secondSolenoidPin">"NONE"</constant>
         <constant name="startStopButtonPin">"NONE"</constant>
+        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
+        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="0" name="mapMinBufferLength" units="count">1.0</constant>
         <constant digits="0" name="idlePidDeactivationTpsThreshold" units="%">5.0</constant>
         <constant digits="0" name="stepperParkingExtraSteps" units="%">0.0</constant>
@@ -466,8 +423,6 @@
         <constant name="acRelayPin">"NONE"</constant>
         <constant digits="0" name="lambdaProtectionMinTps" units="%">50.0</constant>
         <constant digits="1" name="lambdaProtectionTimeout" units="s">0.5</constant>
-        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
-        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="2" name="scriptSetting1" units="">0.0</constant>
         <constant digits="2" name="scriptSetting2" units="">0.0</constant>
         <constant digits="2" name="scriptSetting3" units="">0.0</constant>
@@ -546,6 +501,8 @@
         <constant digits="0" name="boostPwmFrequency" units="Hz">33.0</constant>
         <constant name="launchActivationMode">"Launch Button"</constant>
         <constant name="antiLagActivationMode">"Switch Input"</constant>
+        <constant digits="2" name="tpsAccelLookback" units="sec">0.3</constant>
+        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="0" name="launchSpeedThreshold" units="Kph">30.0</constant>
         <constant digits="0" name="launchRpmWindow" units="RPM">500.0</constant>
         <constant digits="0" name="launchSparkSkipPercent" units="%">0.0</constant>
@@ -596,16 +553,6 @@
         <constant name="drv8860_cs">"NONE"</constant>
         <constant name="drv8860_csPinMode">"default"</constant>
         <constant name="drv8860_miso">"NONE"</constant>
-        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
-         0.0
-         0.71
-         1.43
-         2.14
-         2.86
-         3.57
-         4.29
-         5.0
-</constant>
         <constant name="luaOutputPins1">"NONE"</constant>
         <constant name="luaOutputPins2">"NONE"</constant>
         <constant name="luaOutputPins3">"NONE"</constant>
@@ -811,10 +758,8 @@
         <constant name="auxSerialTxPin">"NONE"</constant>
         <constant name="auxSerialRxPin">"NONE"</constant>
         <constant name="accelerometerCsPin">"NONE"</constant>
-        <constant digits="2" name="tpsAccelLookback" units="sec">0.3</constant>
         <constant digits="0" name="coastingFuelCutVssLow" units="kph">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssHigh" units="kph">0.0</constant>
-        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="1" name="tpsAccelEnrichmentThreshold" units="roc">12.0</constant>
         <constant name="auxSpeedSensorInputPin1">"NONE"</constant>
         <constant name="auxSpeedSensorInputPin2">"NONE"</constant>
@@ -903,7 +848,6 @@
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
-        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="0" name="crankingIACposition" units="percent">70.0</constant>
         <constant digits="4" name="tChargeMinRpmMinTps" units="">0.25</constant>
         <constant digits="4" name="tChargeMinRpmMaxTps" units="">0.25</constant>
@@ -1021,7 +965,6 @@
         <constant name="mc33816_rstb">"NONE"</constant>
         <constant name="mc33816_driven">"NONE"</constant>
         <constant name="brakePedalPin">"NONE"</constant>
-        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant digits="4" name="auxPid1_pFactor" units="">2.0</constant>
         <constant digits="4" name="auxPid1_iFactor" units="">25.4</constant>
         <constant digits="4" name="auxPid1_dFactor" units="">0.1</constant>
@@ -1068,12 +1011,7 @@
         <constant name="tle8888_csPinMode">"default"</constant>
         <constant name="mc33816_cs">"NONE"</constant>
         <constant digits="1" name="auxFrequencyFilter" units="hz">0.0</constant>
-        <constant digits="0" name="vvtControlMinRpm" units="RPM">1500.0</constant>
         <constant name="sentInputPins1">"NONE"</constant>
-        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
-        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
-        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
-        <constant digits="0" name="unused645646" units="">0.0</constant>
         <constant digits="0" name="coastingFuelCutRpmHigh" units="rpm">1500.0</constant>
         <constant digits="0" name="coastingFuelCutRpmLow" units="rpm">1300.0</constant>
         <constant digits="0" name="coastingFuelCutTps" units="%">2.0</constant>
@@ -1090,24 +1028,11 @@
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value2" units="">0.0</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
-         -20.0
-         0.0
-         40.0
-         80.0
-</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant digits="3" name="tChargeAirCoefMin" units="">0.098</constant>
         <constant digits="3" name="tChargeAirCoefMax" units="">0.902</constant>
         <constant digits="1" name="tChargeAirFlowMax" units="kg/h">153.6</constant>
         <constant digits="1" name="tChargeAirIncrLimit" units="deg/sec">1.0</constant>
         <constant digits="1" name="tChargeAirDecrLimit" units="deg/sec">12.5</constant>
-        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="2" name="hip9011Gain" units="">1.0</constant>
         <constant digits="0" name="etb_iTermMin" units="">-30.0</constant>
         <constant digits="0" name="etb_iTermMax" units="">30.0</constant>
@@ -1129,10 +1054,10 @@
         <constant digits="1" name="stoichRatioPrimary" units=":1">14.7</constant>
         <constant digits="0" name="idlerpmpid_iTermMax" units="">20.0</constant>
         <constant digits="0" name="etbIdleThrottleRange" units="%">15.0</constant>
-        <constant digits="0" name="cylinderBankSelect1" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect2" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect3" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect4" units="">0.0</constant>
+        <constant digits="0" name="cylinderBankSelect1" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect2" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect3" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect4" units="">1.0</constant>
         <constant digits="0" name="cylinderBankSelect5" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect6" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect7" units="">0.0</constant>
@@ -1340,24 +1265,6 @@
         <constant name="tcu_solenoid_mode4">"default"</constant>
         <constant name="tcu_solenoid_mode5">"default"</constant>
         <constant name="tcu_solenoid_mode6">"default"</constant>
-        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-</constant>
         <constant digits="3" name="triggerGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom2" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom3" units="ratio">0.0</constant>
@@ -1397,13 +1304,8 @@
         <constant digits="0" name="maxCamPhaseResolveRpm" units="rpm">0.0</constant>
         <constant digits="1" name="dfcoDelay" units="sec">0.0</constant>
         <constant digits="1" name="acDelay" units="sec">0.5</constant>
+        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="3" name="fordInjectorSmallPulseBreakPoint" units="mg">0.0</constant>
-        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="etbJamIntegratorLimit" units="%">0.0</constant>
         <constant digits="0" name="hpfpCamLobes" units="lobes/cam">3.0</constant>
         <constant name="hpfpCam">"NONE"</constant>
@@ -1415,134 +1317,6 @@
         <constant digits="3" name="hpfpPidP" units="%/kPa">0.01</constant>
         <constant digits="5" name="hpfpPidI" units="%/kPa/lobe">3.0E-4</constant>
         <constant digits="0" name="hpfpTargetDecay" units="kPa/s">2000.0</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
-         0.0
-         1.0
-         4.5
-         9.5
-         16.5
-         25.0
-         34.5
-         45.0
-         55.0
-         65.5
-         75.0
-         83.5
-         90.5
-         95.5
-         99.0
-         100.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
-         0.0
-         7.5
-         16.5
-         24.0
-         32.0
-         40.0
-         48.0
-         56.0
-         64.0
-         72.0
-         80.0
-         88.0
-         96.0
-         103.5
-         112.5
-         120.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         15.0
-         16.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-         120.0
-         140.0
-         160.0
-         180.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
-         0.005
-         0.018
-         0.031
-         0.043
-         0.056
-         0.069
-         0.082
-         0.094
-         0.107
-         0.12
-</constant>
-        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
         <constant name="stepper_raw_output1">"NONE"</constant>
         <constant name="stepper_raw_output2">"NONE"</constant>
         <constant name="stepper_raw_output3">"NONE"</constant>
@@ -1558,66 +1332,6 @@
         <constant digits="2" name="gearRatio9" units="ratio">0.0</constant>
         <constant digits="2" name="gearRatio10" units="ratio">0.0</constant>
         <constant digits="0" name="vvtActivationDelayMs" units="ms">6000.0</constant>
-        <constant cols="1" digits="0" name="wwCltBins" rows="8">
-         -40.0
-         -20.0
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
-         1.45
-         1.3
-         1.17
-         1.05
-         0.9
-         0.82
-         0.75
-         0.7
-</constant>
-        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
-         0.73
-         0.66
-         0.57
-         0.46
-         0.38
-         0.31
-         0.24
-         0.19
-</constant>
-        <constant cols="1" digits="0" name="wwMapBins" rows="8">
-         10.0
-         20.0
-         30.0
-         40.0
-         50.0
-         60.0
-         70.0
-         80.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
-         0.38
-         0.55
-         0.69
-         0.86
-         0.9
-         0.95
-         0.97
-         1.0
-</constant>
-        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
-         0.21
-         0.4
-         0.6
-         0.79
-         0.85
-         0.9
-         0.95
-         1.0
-</constant>
         <constant cols="6" digits="0" name="torqueTable" rows="6">
          0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0
@@ -1703,7 +1417,6 @@
          0.0
          0.0
 </constant>
-        <constant digits="0" name="unused3124141" units="">0.0</constant>
         <constant name="fuelPressureSensorMode">"Absolute"</constant>
         <constant name="luaDigitalInputPins1">"NONE"</constant>
         <constant name="luaDigitalInputPins2">"NONE"</constant>
@@ -1713,12 +1426,6 @@
         <constant name="luaDigitalInputPins6">"NONE"</constant>
         <constant name="luaDigitalInputPins7">"NONE"</constant>
         <constant name="luaDigitalInputPins8">"NONE"</constant>
-        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
-         650.0
-         800.0
-         3750.0
-         7000.0
-</constant>
         <constant digits="0" name="ALSMinRPM" units="rpm">400.0</constant>
         <constant digits="0" name="ALSMaxRPM" units="rpm">3200.0</constant>
         <constant digits="0" name="ALSMaxDuration" units="sec">3.0</constant>
@@ -1894,7 +1601,124 @@
         <constant name="spi5MisoMode">"default"</constant>
         <constant name="spi6SckMode">"default"</constant>
         <constant name="spi6MosiMode">"default"</constant>
-        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="120">
+        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
+        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="236">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
          0.0
          0.0
          0.0
@@ -2380,40 +2204,22 @@
          0.0
          0.0
 </constant>
-        <constant cols="1" digits="0" name="unusedGapInCalibration" rows="32">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
+        <constant digits="0" name="fancyOptions1" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions2" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions3" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions4" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions5" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions6" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions7" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions8" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions9" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions10" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions11" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions12" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions13" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions14" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions15" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions16" units="">0.0</constant>
         <constant cols="8" digits="1" name="boostTableOpenLoop" rows="8">
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
@@ -4601,9 +4407,297 @@ end</constant>
          3600.0
          5000.0
          7000.0
+</constant>
+        <constant cols="1" digits="0" name="wwCltBins" rows="8">
+         -40.0
+         -20.0
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
+         1.45
+         1.3
+         1.17
+         1.05
+         0.9
+         0.82
+         0.75
+         0.7
+</constant>
+        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
+         0.73
+         0.66
+         0.57
+         0.46
+         0.38
+         0.31
+         0.24
+         0.19
+</constant>
+        <constant cols="1" digits="0" name="wwMapBins" rows="8">
+         10.0
+         20.0
+         30.0
+         40.0
+         50.0
+         60.0
+         70.0
+         80.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
+         0.38
+         0.55
+         0.69
+         0.86
+         0.9
+         0.95
+         0.97
+         1.0
+</constant>
+        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
+         0.21
+         0.4
+         0.6
+         0.79
+         0.85
+         0.9
+         0.95
+         1.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
+         0.0
+         1.0
+         4.5
+         9.5
+         16.5
+         25.0
+         34.5
+         45.0
+         55.0
+         65.5
+         75.0
+         83.5
+         90.5
+         95.5
+         99.0
+         100.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
+         0.0
+         7.5
+         16.5
+         24.0
+         32.0
+         40.0
+         48.0
+         56.0
+         64.0
+         72.0
+         80.0
+         88.0
+         96.0
+         103.5
+         112.5
+         120.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         15.0
+         16.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+         120.0
+         140.0
+         160.0
+         180.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
+         0.005
+         0.018
+         0.031
+         0.043
+         0.056
+         0.069
+         0.082
+         0.094
+         0.107
+         0.12
+</constant>
+        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
+         650.0
+         800.0
+         1100.0
+         1400.0
+         1700.0
+         2000.0
+         2300.0
+         2600.0
+         2900.0
+         3200.0
+         3500.0
+         3800.0
+         4100.0
+         4400.0
+         4700.0
+         7000.0
+</constant>
+        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+</constant>
+        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
+         650.0
+         800.0
+         3750.0
+         7000.0
+</constant>
+        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
+         1.0
+         1.0
+         1.0
+         1.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
+         -20.0
+         0.0
+         40.0
+         80.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
+         0.0
+         0.71
+         1.43
+         2.14
+         2.86
+         3.57
+         4.29
+         5.0
+</constant>
+        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         14.0
+         15.0
+</constant>
+        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.19.XXX.4275859823" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.22.XXX.4019883890" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK2.msq b/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK2.msq
index 415ddbe..0369852 100644
--- a/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK2.msq
+++ b/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK2.msq
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <msq xmlns="http://www.msefi.com/:msq">
     <page/>
-    <page number="0" size="22428">
+    <page number="0" size="22400">
         <constant name="engineType">"HELLEN_154_HYUNDAI_COUPE_BK2"</constant>
         <constant digits="0" name="startButtonSuppressOnStartUpMs" units="">0.0</constant>
         <constant digits="0" name="sensorSnifferRpmThreshold" units="RPM">2500.0</constant>
@@ -12,26 +12,25 @@
         <constant digits="0" name="maxAcRpm" units="rpm">5000.0</constant>
         <constant digits="0" name="maxAcTps" units="%">75.0</constant>
         <constant digits="0" name="maxAcClt" units="deg C">100.0</constant>
-        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
-         650.0
-         800.0
-         1100.0
-         1400.0
-         1700.0
-         2000.0
-         2300.0
-         2600.0
-         2900.0
-         3200.0
-         3500.0
-         3800.0
-         4100.0
-         4400.0
-         4700.0
-         7000.0
-</constant>
+        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
+        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
+        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
+        <constant name="mainRelayPin">"NONE"</constant>
+        <constant name="sdCardCsPin">"NONE"</constant>
+        <constant name="canTxPin">"NONE"</constant>
+        <constant name="canRxPin">"NONE"</constant>
+        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
+        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
+        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
+        <constant name="tachOutputPin">"NONE"</constant>
+        <constant name="tachOutputPinMode">"default"</constant>
+        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
+        <constant digits="0" name="manIdlePosition" units="%">50.0</constant>
         <constant digits="0" name="multisparkMaxSparkingAngle" units="deg">30.0</constant>
         <constant digits="0" name="multisparkMaxExtraSparkCount" units="count">2.0</constant>
+        <constant digits="0" name="vvtControlMinRpm" units="RPM">1500.0</constant>
         <constant digits="2" name="injector_flow" units="cm3/min">629.03</constant>
         <constant cols="1" digits="2" name="injector_battLagCorrBins" rows="8">
          6.0
@@ -182,6 +181,7 @@
         <constant digits="0" name="triggerSimulatorRpm" units="RPM">1200.0</constant>
         <constant digits="0" name="cylindersCount" units="">4.0</constant>
         <constant name="firingOrder">"1-3-4-2"</constant>
+        <constant digits="0" name="justATempTest" units="">0.0</constant>
         <constant name="communityCommsLedPid">"NONE"</constant>
         <constant digits="2" name="cylinderBore" units="mm">87.5</constant>
         <constant name="fuelAlgorithm">"Speed Density"</constant>
@@ -195,8 +195,10 @@
         <constant name="ignitionMode">"Individual Coils"</constant>
         <constant digits="0" name="gapTrackingLengthOverride" units="count">0.0</constant>
         <constant digits="0" name="maxIdleVss" units="kph">0.0</constant>
+        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
         <constant digits="0" name="minOilPressureAfterStart" units="kPa">0.0</constant>
         <constant name="timingMode">"dynamic"</constant>
+        <constant name="canNbcType">"None"</constant>
         <constant digits="0" name="fixedModeTiming" units="RPM">50.0</constant>
         <constant digits="0" name="globalTriggerAngleOffset" units="deg btdc">475.0</constant>
         <constant digits="2" name="analogInputDividerCoefficient" units="coef">2.0</constant>
@@ -205,12 +207,7 @@
         <constant digits="0" name="fanOffTemperature" units="deg C">75.0</constant>
         <constant name="acrPin">"NONE"</constant>
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">1000.0</constant>
-        <constant name="canNbcType">"None"</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
-        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
-        <constant digits="0" name="justATempTest" units="">0.0</constant>
-        <constant digits="0" name="unusedHere333" units="">0.0</constant>
-        <constant digits="0" name="unusedHere334" units="">0.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
         <constant name="tps1_1AdcChannel">"Disabled"</constant>
         <constant name="vbattAdcChannel">"Disabled"</constant>
@@ -226,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.0240319E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240322E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -254,12 +251,12 @@
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
         <constant name="idle_stepperStepPin">"NONE"</constant>
         <constant name="idle_solenoidPinMode">"default"</constant>
-        <constant digits="0" name="manIdlePosition" units="%">50.0</constant>
         <constant digits="1" name="knockRetardAggression" units="%">20.0</constant>
         <constant digits="1" name="knockRetardReapplyRate" units="deg/s">3.0</constant>
         <constant name="engineSyncCam">"Intake First Bank"</constant>
-        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
+        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="3" name="vssGearRatio" units="ratio">3.73</constant>
+        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
         <constant digits="0" name="vssToothCount" units="count">21.0</constant>
         <constant name="idleVeOverrideMode">"None"</constant>
         <constant name="l9779_cs">"NONE"</constant>
@@ -308,22 +305,13 @@
         <constant name="max31855spiDevice">"Off"</constant>
         <constant name="debugTriggerSync">"NONE"</constant>
         <constant name="digitalPotentiometerSpiDevice">"Off"</constant>
+        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
         <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
         <constant name="tps1_2AdcChannel">"Disabled"</constant>
         <constant name="tps2_2AdcChannel">"Disabled"</constant>
         <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
-        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -331,23 +319,10 @@
         <constant name="triggerInputPins2">"NONE"</constant>
         <constant digits="0" name="mc33_t_min_boost" units="us">100.0</constant>
         <constant name="hip9011CsPinMode">"default"</constant>
-        <constant name="tachOutputPin">"NONE"</constant>
-        <constant name="tachOutputPinMode">"default"</constant>
-        <constant name="mainRelayPin">"NONE"</constant>
-        <constant name="sdCardCsPin">"NONE"</constant>
-        <constant name="canTxPin">"NONE"</constant>
-        <constant name="canRxPin">"NONE"</constant>
         <constant name="throttlePedalUpPinMode">"DEFAULT"</constant>
-        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
         <constant digits="2" name="finalGearRatio" units="ratio">1.0</constant>
         <constant name="tcuInputSpeedSensorPin">"NONE"</constant>
         <constant digits="0" name="tcuInputSpeedSensorTeeth" units="">1.0</constant>
-        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
-        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
         <constant name="triggerSimulatorPins1">"NONE"</constant>
         <constant name="triggerSimulatorPins2">"NONE"</constant>
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
@@ -403,27 +378,7 @@
         <constant name="acFanPin">"NONE"</constant>
         <constant name="acFanPinMode">"default"</constant>
         <constant name="l9779spiDevice">"Off"</constant>
-        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         14.0
-         15.0
-</constant>
         <constant name="imuType">"None"</constant>
-        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="vehicleWeight" units="kg">0.0</constant>
         <constant digits="0" name="idlePidRpmUpperLimit" units="RPM">300.0</constant>
         <constant digits="3" name="applyNonlinearBelowPulse" units="ms">0.0</constant>
@@ -454,6 +409,8 @@
         <constant name="starterRelayDisablePinMode">"default"</constant>
         <constant name="secondSolenoidPin">"NONE"</constant>
         <constant name="startStopButtonPin">"NONE"</constant>
+        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
+        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="0" name="mapMinBufferLength" units="count">1.0</constant>
         <constant digits="0" name="idlePidDeactivationTpsThreshold" units="%">5.0</constant>
         <constant digits="0" name="stepperParkingExtraSteps" units="%">0.0</constant>
@@ -466,8 +423,6 @@
         <constant name="acRelayPin">"NONE"</constant>
         <constant digits="0" name="lambdaProtectionMinTps" units="%">50.0</constant>
         <constant digits="1" name="lambdaProtectionTimeout" units="s">0.5</constant>
-        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
-        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="2" name="scriptSetting1" units="">0.0</constant>
         <constant digits="2" name="scriptSetting2" units="">0.0</constant>
         <constant digits="2" name="scriptSetting3" units="">0.0</constant>
@@ -546,6 +501,8 @@
         <constant digits="0" name="boostPwmFrequency" units="Hz">33.0</constant>
         <constant name="launchActivationMode">"Launch Button"</constant>
         <constant name="antiLagActivationMode">"Switch Input"</constant>
+        <constant digits="2" name="tpsAccelLookback" units="sec">0.3</constant>
+        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="0" name="launchSpeedThreshold" units="Kph">30.0</constant>
         <constant digits="0" name="launchRpmWindow" units="RPM">500.0</constant>
         <constant digits="0" name="launchSparkSkipPercent" units="%">0.0</constant>
@@ -596,16 +553,6 @@
         <constant name="drv8860_cs">"NONE"</constant>
         <constant name="drv8860_csPinMode">"default"</constant>
         <constant name="drv8860_miso">"NONE"</constant>
-        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
-         0.0
-         0.71
-         1.43
-         2.14
-         2.86
-         3.57
-         4.29
-         5.0
-</constant>
         <constant name="luaOutputPins1">"NONE"</constant>
         <constant name="luaOutputPins2">"NONE"</constant>
         <constant name="luaOutputPins3">"NONE"</constant>
@@ -811,10 +758,8 @@
         <constant name="auxSerialTxPin">"NONE"</constant>
         <constant name="auxSerialRxPin">"NONE"</constant>
         <constant name="accelerometerCsPin">"NONE"</constant>
-        <constant digits="2" name="tpsAccelLookback" units="sec">0.3</constant>
         <constant digits="0" name="coastingFuelCutVssLow" units="kph">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssHigh" units="kph">0.0</constant>
-        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="1" name="tpsAccelEnrichmentThreshold" units="roc">12.0</constant>
         <constant name="auxSpeedSensorInputPin1">"NONE"</constant>
         <constant name="auxSpeedSensorInputPin2">"NONE"</constant>
@@ -903,7 +848,6 @@
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
-        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="0" name="crankingIACposition" units="percent">70.0</constant>
         <constant digits="4" name="tChargeMinRpmMinTps" units="">0.25</constant>
         <constant digits="4" name="tChargeMinRpmMaxTps" units="">0.25</constant>
@@ -1021,7 +965,6 @@
         <constant name="mc33816_rstb">"NONE"</constant>
         <constant name="mc33816_driven">"NONE"</constant>
         <constant name="brakePedalPin">"NONE"</constant>
-        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant digits="4" name="auxPid1_pFactor" units="">2.0</constant>
         <constant digits="4" name="auxPid1_iFactor" units="">25.4</constant>
         <constant digits="4" name="auxPid1_dFactor" units="">0.1</constant>
@@ -1068,12 +1011,7 @@
         <constant name="tle8888_csPinMode">"default"</constant>
         <constant name="mc33816_cs">"NONE"</constant>
         <constant digits="1" name="auxFrequencyFilter" units="hz">0.0</constant>
-        <constant digits="0" name="vvtControlMinRpm" units="RPM">1500.0</constant>
         <constant name="sentInputPins1">"NONE"</constant>
-        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
-        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
-        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
-        <constant digits="0" name="unused645646" units="">0.0</constant>
         <constant digits="0" name="coastingFuelCutRpmHigh" units="rpm">1500.0</constant>
         <constant digits="0" name="coastingFuelCutRpmLow" units="rpm">1300.0</constant>
         <constant digits="0" name="coastingFuelCutTps" units="%">2.0</constant>
@@ -1090,24 +1028,11 @@
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value2" units="">0.0</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
-         -20.0
-         0.0
-         40.0
-         80.0
-</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant digits="3" name="tChargeAirCoefMin" units="">0.098</constant>
         <constant digits="3" name="tChargeAirCoefMax" units="">0.902</constant>
         <constant digits="1" name="tChargeAirFlowMax" units="kg/h">153.6</constant>
         <constant digits="1" name="tChargeAirIncrLimit" units="deg/sec">1.0</constant>
         <constant digits="1" name="tChargeAirDecrLimit" units="deg/sec">12.5</constant>
-        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="2" name="hip9011Gain" units="">1.0</constant>
         <constant digits="0" name="etb_iTermMin" units="">-30.0</constant>
         <constant digits="0" name="etb_iTermMax" units="">30.0</constant>
@@ -1129,10 +1054,10 @@
         <constant digits="1" name="stoichRatioPrimary" units=":1">14.7</constant>
         <constant digits="0" name="idlerpmpid_iTermMax" units="">20.0</constant>
         <constant digits="0" name="etbIdleThrottleRange" units="%">15.0</constant>
-        <constant digits="0" name="cylinderBankSelect1" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect2" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect3" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect4" units="">0.0</constant>
+        <constant digits="0" name="cylinderBankSelect1" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect2" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect3" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect4" units="">1.0</constant>
         <constant digits="0" name="cylinderBankSelect5" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect6" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect7" units="">0.0</constant>
@@ -1340,24 +1265,6 @@
         <constant name="tcu_solenoid_mode4">"default"</constant>
         <constant name="tcu_solenoid_mode5">"default"</constant>
         <constant name="tcu_solenoid_mode6">"default"</constant>
-        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-</constant>
         <constant digits="3" name="triggerGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom2" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom3" units="ratio">0.0</constant>
@@ -1397,13 +1304,8 @@
         <constant digits="0" name="maxCamPhaseResolveRpm" units="rpm">0.0</constant>
         <constant digits="1" name="dfcoDelay" units="sec">0.0</constant>
         <constant digits="1" name="acDelay" units="sec">0.5</constant>
+        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="3" name="fordInjectorSmallPulseBreakPoint" units="mg">0.0</constant>
-        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="etbJamIntegratorLimit" units="%">0.0</constant>
         <constant digits="0" name="hpfpCamLobes" units="lobes/cam">3.0</constant>
         <constant name="hpfpCam">"NONE"</constant>
@@ -1415,134 +1317,6 @@
         <constant digits="3" name="hpfpPidP" units="%/kPa">0.01</constant>
         <constant digits="5" name="hpfpPidI" units="%/kPa/lobe">3.0E-4</constant>
         <constant digits="0" name="hpfpTargetDecay" units="kPa/s">2000.0</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
-         0.0
-         1.0
-         4.5
-         9.5
-         16.5
-         25.0
-         34.5
-         45.0
-         55.0
-         65.5
-         75.0
-         83.5
-         90.5
-         95.5
-         99.0
-         100.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
-         0.0
-         7.5
-         16.5
-         24.0
-         32.0
-         40.0
-         48.0
-         56.0
-         64.0
-         72.0
-         80.0
-         88.0
-         96.0
-         103.5
-         112.5
-         120.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         15.0
-         16.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-         120.0
-         140.0
-         160.0
-         180.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
-         0.005
-         0.018
-         0.031
-         0.043
-         0.056
-         0.069
-         0.082
-         0.094
-         0.107
-         0.12
-</constant>
-        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
         <constant name="stepper_raw_output1">"NONE"</constant>
         <constant name="stepper_raw_output2">"NONE"</constant>
         <constant name="stepper_raw_output3">"NONE"</constant>
@@ -1558,66 +1332,6 @@
         <constant digits="2" name="gearRatio9" units="ratio">0.0</constant>
         <constant digits="2" name="gearRatio10" units="ratio">0.0</constant>
         <constant digits="0" name="vvtActivationDelayMs" units="ms">6000.0</constant>
-        <constant cols="1" digits="0" name="wwCltBins" rows="8">
-         -40.0
-         -20.0
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
-         1.45
-         1.3
-         1.17
-         1.05
-         0.9
-         0.82
-         0.75
-         0.7
-</constant>
-        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
-         0.73
-         0.66
-         0.57
-         0.46
-         0.38
-         0.31
-         0.24
-         0.19
-</constant>
-        <constant cols="1" digits="0" name="wwMapBins" rows="8">
-         10.0
-         20.0
-         30.0
-         40.0
-         50.0
-         60.0
-         70.0
-         80.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
-         0.38
-         0.55
-         0.69
-         0.86
-         0.9
-         0.95
-         0.97
-         1.0
-</constant>
-        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
-         0.21
-         0.4
-         0.6
-         0.79
-         0.85
-         0.9
-         0.95
-         1.0
-</constant>
         <constant cols="6" digits="0" name="torqueTable" rows="6">
          0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0
@@ -1703,7 +1417,6 @@
          0.0
          0.0
 </constant>
-        <constant digits="0" name="unused3124141" units="">0.0</constant>
         <constant name="fuelPressureSensorMode">"Absolute"</constant>
         <constant name="luaDigitalInputPins1">"NONE"</constant>
         <constant name="luaDigitalInputPins2">"NONE"</constant>
@@ -1713,12 +1426,6 @@
         <constant name="luaDigitalInputPins6">"NONE"</constant>
         <constant name="luaDigitalInputPins7">"NONE"</constant>
         <constant name="luaDigitalInputPins8">"NONE"</constant>
-        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
-         650.0
-         800.0
-         3750.0
-         7000.0
-</constant>
         <constant digits="0" name="ALSMinRPM" units="rpm">400.0</constant>
         <constant digits="0" name="ALSMaxRPM" units="rpm">3200.0</constant>
         <constant digits="0" name="ALSMaxDuration" units="sec">3.0</constant>
@@ -1894,7 +1601,124 @@
         <constant name="spi5MisoMode">"default"</constant>
         <constant name="spi6SckMode">"default"</constant>
         <constant name="spi6MosiMode">"default"</constant>
-        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="120">
+        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
+        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="236">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
          0.0
          0.0
          0.0
@@ -2380,40 +2204,22 @@
          0.0
          0.0
 </constant>
-        <constant cols="1" digits="0" name="unusedGapInCalibration" rows="32">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
+        <constant digits="0" name="fancyOptions1" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions2" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions3" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions4" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions5" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions6" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions7" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions8" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions9" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions10" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions11" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions12" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions13" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions14" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions15" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions16" units="">0.0</constant>
         <constant cols="8" digits="1" name="boostTableOpenLoop" rows="8">
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
@@ -4601,9 +4407,297 @@ end</constant>
          3600.0
          5000.0
          7000.0
+</constant>
+        <constant cols="1" digits="0" name="wwCltBins" rows="8">
+         -40.0
+         -20.0
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
+         1.45
+         1.3
+         1.17
+         1.05
+         0.9
+         0.82
+         0.75
+         0.7
+</constant>
+        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
+         0.73
+         0.66
+         0.57
+         0.46
+         0.38
+         0.31
+         0.24
+         0.19
+</constant>
+        <constant cols="1" digits="0" name="wwMapBins" rows="8">
+         10.0
+         20.0
+         30.0
+         40.0
+         50.0
+         60.0
+         70.0
+         80.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
+         0.38
+         0.55
+         0.69
+         0.86
+         0.9
+         0.95
+         0.97
+         1.0
+</constant>
+        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
+         0.21
+         0.4
+         0.6
+         0.79
+         0.85
+         0.9
+         0.95
+         1.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
+         0.0
+         1.0
+         4.5
+         9.5
+         16.5
+         25.0
+         34.5
+         45.0
+         55.0
+         65.5
+         75.0
+         83.5
+         90.5
+         95.5
+         99.0
+         100.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
+         0.0
+         7.5
+         16.5
+         24.0
+         32.0
+         40.0
+         48.0
+         56.0
+         64.0
+         72.0
+         80.0
+         88.0
+         96.0
+         103.5
+         112.5
+         120.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         15.0
+         16.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+         120.0
+         140.0
+         160.0
+         180.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
+         0.005
+         0.018
+         0.031
+         0.043
+         0.056
+         0.069
+         0.082
+         0.094
+         0.107
+         0.12
+</constant>
+        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
+         650.0
+         800.0
+         1100.0
+         1400.0
+         1700.0
+         2000.0
+         2300.0
+         2600.0
+         2900.0
+         3200.0
+         3500.0
+         3800.0
+         4100.0
+         4400.0
+         4700.0
+         7000.0
+</constant>
+        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+</constant>
+        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
+         650.0
+         800.0
+         3750.0
+         7000.0
+</constant>
+        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
+         1.0
+         1.0
+         1.0
+         1.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
+         -20.0
+         0.0
+         40.0
+         80.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
+         0.0
+         0.71
+         1.43
+         2.14
+         2.86
+         3.57
+         4.29
+         5.0
+</constant>
+        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         14.0
+         15.0
+</constant>
+        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.19.XXX.4275859823" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.22.XXX.4019883890" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_HONDA_K.msq b/generated/simulator_tune_HONDA_K.msq
index efb4171..6b052d7 100644
--- a/generated/simulator_tune_HONDA_K.msq
+++ b/generated/simulator_tune_HONDA_K.msq
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <msq xmlns="http://www.msefi.com/:msq">
     <page/>
-    <page number="0" size="22428">
+    <page number="0" size="22400">
         <constant name="engineType">"HONDA_K"</constant>
         <constant digits="0" name="startButtonSuppressOnStartUpMs" units="">0.0</constant>
         <constant digits="0" name="sensorSnifferRpmThreshold" units="RPM">2500.0</constant>
@@ -12,26 +12,25 @@
         <constant digits="0" name="maxAcRpm" units="rpm">5000.0</constant>
         <constant digits="0" name="maxAcTps" units="%">75.0</constant>
         <constant digits="0" name="maxAcClt" units="deg C">100.0</constant>
-        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
-         650.0
-         800.0
-         1100.0
-         1400.0
-         1700.0
-         2000.0
-         2300.0
-         2600.0
-         2900.0
-         3200.0
-         3500.0
-         3800.0
-         4100.0
-         4400.0
-         4700.0
-         7000.0
-</constant>
+        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
+        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
+        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
+        <constant name="mainRelayPin">"NONE"</constant>
+        <constant name="sdCardCsPin">"NONE"</constant>
+        <constant name="canTxPin">"NONE"</constant>
+        <constant name="canRxPin">"NONE"</constant>
+        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
+        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
+        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
+        <constant name="tachOutputPin">"NONE"</constant>
+        <constant name="tachOutputPinMode">"default"</constant>
+        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
+        <constant digits="0" name="manIdlePosition" units="%">50.0</constant>
         <constant digits="0" name="multisparkMaxSparkingAngle" units="deg">30.0</constant>
         <constant digits="0" name="multisparkMaxExtraSparkCount" units="count">2.0</constant>
+        <constant digits="0" name="vvtControlMinRpm" units="RPM">500.0</constant>
         <constant digits="2" name="injector_flow" units="cm3/min">310.0</constant>
         <constant cols="1" digits="2" name="injector_battLagCorrBins" rows="8">
          6.0
@@ -182,6 +181,7 @@
         <constant digits="0" name="triggerSimulatorRpm" units="RPM">1200.0</constant>
         <constant digits="0" name="cylindersCount" units="">4.0</constant>
         <constant name="firingOrder">"1-3-4-2"</constant>
+        <constant digits="0" name="justATempTest" units="">0.0</constant>
         <constant name="communityCommsLedPid">"NONE"</constant>
         <constant digits="2" name="cylinderBore" units="mm">87.5</constant>
         <constant name="fuelAlgorithm">"Speed Density"</constant>
@@ -195,8 +195,10 @@
         <constant name="ignitionMode">"Individual Coils"</constant>
         <constant digits="0" name="gapTrackingLengthOverride" units="count">0.0</constant>
         <constant digits="0" name="maxIdleVss" units="kph">0.0</constant>
+        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
         <constant digits="0" name="minOilPressureAfterStart" units="kPa">0.0</constant>
         <constant name="timingMode">"dynamic"</constant>
+        <constant name="canNbcType">"None"</constant>
         <constant digits="0" name="fixedModeTiming" units="RPM">50.0</constant>
         <constant digits="0" name="globalTriggerAngleOffset" units="deg btdc">663.0</constant>
         <constant digits="2" name="analogInputDividerCoefficient" units="coef">2.0</constant>
@@ -205,12 +207,7 @@
         <constant digits="0" name="fanOffTemperature" units="deg C">88.0</constant>
         <constant name="acrPin">"NONE"</constant>
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">1000.0</constant>
-        <constant name="canNbcType">"None"</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
-        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
-        <constant digits="0" name="justATempTest" units="">0.0</constant>
-        <constant digits="0" name="unusedHere333" units="">0.0</constant>
-        <constant digits="0" name="unusedHere334" units="">0.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
         <constant name="tps1_1AdcChannel">"Disabled"</constant>
         <constant name="vbattAdcChannel">"Disabled"</constant>
@@ -226,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.0240319E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240322E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -254,12 +251,12 @@
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
         <constant name="idle_stepperStepPin">"NONE"</constant>
         <constant name="idle_solenoidPinMode">"default"</constant>
-        <constant digits="0" name="manIdlePosition" units="%">50.0</constant>
         <constant digits="1" name="knockRetardAggression" units="%">20.0</constant>
         <constant digits="1" name="knockRetardReapplyRate" units="deg/s">3.0</constant>
         <constant name="engineSyncCam">"Exhaust First Bank"</constant>
-        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
+        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="3" name="vssGearRatio" units="ratio">3.73</constant>
+        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
         <constant digits="0" name="vssToothCount" units="count">21.0</constant>
         <constant name="idleVeOverrideMode">"None"</constant>
         <constant name="l9779_cs">"NONE"</constant>
@@ -308,22 +305,13 @@
         <constant name="max31855spiDevice">"Off"</constant>
         <constant name="debugTriggerSync">"NONE"</constant>
         <constant name="digitalPotentiometerSpiDevice">"Off"</constant>
+        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
         <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
         <constant name="tps1_2AdcChannel">"Disabled"</constant>
         <constant name="tps2_2AdcChannel">"Disabled"</constant>
         <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
-        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -331,23 +319,10 @@
         <constant name="triggerInputPins2">"NONE"</constant>
         <constant digits="0" name="mc33_t_min_boost" units="us">100.0</constant>
         <constant name="hip9011CsPinMode">"default"</constant>
-        <constant name="tachOutputPin">"NONE"</constant>
-        <constant name="tachOutputPinMode">"default"</constant>
-        <constant name="mainRelayPin">"NONE"</constant>
-        <constant name="sdCardCsPin">"NONE"</constant>
-        <constant name="canTxPin">"NONE"</constant>
-        <constant name="canRxPin">"NONE"</constant>
         <constant name="throttlePedalUpPinMode">"DEFAULT"</constant>
-        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
         <constant digits="2" name="finalGearRatio" units="ratio">1.0</constant>
         <constant name="tcuInputSpeedSensorPin">"NONE"</constant>
         <constant digits="0" name="tcuInputSpeedSensorTeeth" units="">1.0</constant>
-        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
-        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
         <constant name="triggerSimulatorPins1">"NONE"</constant>
         <constant name="triggerSimulatorPins2">"NONE"</constant>
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
@@ -403,27 +378,7 @@
         <constant name="acFanPin">"NONE"</constant>
         <constant name="acFanPinMode">"default"</constant>
         <constant name="l9779spiDevice">"Off"</constant>
-        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         14.0
-         15.0
-</constant>
         <constant name="imuType">"None"</constant>
-        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="vehicleWeight" units="kg">0.0</constant>
         <constant digits="0" name="idlePidRpmUpperLimit" units="RPM">300.0</constant>
         <constant digits="3" name="applyNonlinearBelowPulse" units="ms">0.0</constant>
@@ -454,6 +409,8 @@
         <constant name="starterRelayDisablePinMode">"default"</constant>
         <constant name="secondSolenoidPin">"NONE"</constant>
         <constant name="startStopButtonPin">"NONE"</constant>
+        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
+        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="0" name="mapMinBufferLength" units="count">1.0</constant>
         <constant digits="0" name="idlePidDeactivationTpsThreshold" units="%">5.0</constant>
         <constant digits="0" name="stepperParkingExtraSteps" units="%">0.0</constant>
@@ -466,8 +423,6 @@
         <constant name="acRelayPin">"NONE"</constant>
         <constant digits="0" name="lambdaProtectionMinTps" units="%">50.0</constant>
         <constant digits="1" name="lambdaProtectionTimeout" units="s">0.5</constant>
-        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
-        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="2" name="scriptSetting1" units="">0.0</constant>
         <constant digits="2" name="scriptSetting2" units="">0.0</constant>
         <constant digits="2" name="scriptSetting3" units="">0.0</constant>
@@ -546,6 +501,8 @@
         <constant digits="0" name="boostPwmFrequency" units="Hz">33.0</constant>
         <constant name="launchActivationMode">"Launch Button"</constant>
         <constant name="antiLagActivationMode">"Switch Input"</constant>
+        <constant digits="2" name="tpsAccelLookback" units="sec">0.0</constant>
+        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="0" name="launchSpeedThreshold" units="Kph">30.0</constant>
         <constant digits="0" name="launchRpmWindow" units="RPM">500.0</constant>
         <constant digits="0" name="launchSparkSkipPercent" units="%">0.0</constant>
@@ -596,16 +553,6 @@
         <constant name="drv8860_cs">"NONE"</constant>
         <constant name="drv8860_csPinMode">"default"</constant>
         <constant name="drv8860_miso">"NONE"</constant>
-        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
-         0.0
-         0.71
-         1.43
-         2.14
-         2.86
-         3.57
-         4.29
-         5.0
-</constant>
         <constant name="luaOutputPins1">"NONE"</constant>
         <constant name="luaOutputPins2">"NONE"</constant>
         <constant name="luaOutputPins3">"NONE"</constant>
@@ -811,10 +758,8 @@
         <constant name="auxSerialTxPin">"NONE"</constant>
         <constant name="auxSerialRxPin">"NONE"</constant>
         <constant name="accelerometerCsPin">"NONE"</constant>
-        <constant digits="2" name="tpsAccelLookback" units="sec">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssLow" units="kph">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssHigh" units="kph">0.0</constant>
-        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="1" name="tpsAccelEnrichmentThreshold" units="roc">40.0</constant>
         <constant name="auxSpeedSensorInputPin1">"NONE"</constant>
         <constant name="auxSpeedSensorInputPin2">"NONE"</constant>
@@ -903,7 +848,6 @@
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
-        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="0" name="crankingIACposition" units="percent">70.0</constant>
         <constant digits="4" name="tChargeMinRpmMinTps" units="">0.25</constant>
         <constant digits="4" name="tChargeMinRpmMaxTps" units="">0.25</constant>
@@ -1021,7 +965,6 @@
         <constant name="mc33816_rstb">"NONE"</constant>
         <constant name="mc33816_driven">"NONE"</constant>
         <constant name="brakePedalPin">"NONE"</constant>
-        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant digits="4" name="auxPid1_pFactor" units="">2.0</constant>
         <constant digits="4" name="auxPid1_iFactor" units="">0.005</constant>
         <constant digits="4" name="auxPid1_dFactor" units="">0.0</constant>
@@ -1068,12 +1011,7 @@
         <constant name="tle8888_csPinMode">"default"</constant>
         <constant name="mc33816_cs">"NONE"</constant>
         <constant digits="1" name="auxFrequencyFilter" units="hz">0.0</constant>
-        <constant digits="0" name="vvtControlMinRpm" units="RPM">500.0</constant>
         <constant name="sentInputPins1">"NONE"</constant>
-        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
-        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
-        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
-        <constant digits="0" name="unused645646" units="">0.0</constant>
         <constant digits="0" name="coastingFuelCutRpmHigh" units="rpm">1500.0</constant>
         <constant digits="0" name="coastingFuelCutRpmLow" units="rpm">1300.0</constant>
         <constant digits="0" name="coastingFuelCutTps" units="%">2.0</constant>
@@ -1090,24 +1028,11 @@
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value2" units="">0.0</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
-         -20.0
-         0.0
-         40.0
-         80.0
-</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant digits="3" name="tChargeAirCoefMin" units="">0.098</constant>
         <constant digits="3" name="tChargeAirCoefMax" units="">0.902</constant>
         <constant digits="1" name="tChargeAirFlowMax" units="kg/h">153.6</constant>
         <constant digits="1" name="tChargeAirIncrLimit" units="deg/sec">1.0</constant>
         <constant digits="1" name="tChargeAirDecrLimit" units="deg/sec">12.5</constant>
-        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="2" name="hip9011Gain" units="">1.0</constant>
         <constant digits="0" name="etb_iTermMin" units="">-30.0</constant>
         <constant digits="0" name="etb_iTermMax" units="">30.0</constant>
@@ -1129,10 +1054,10 @@
         <constant digits="1" name="stoichRatioPrimary" units=":1">14.7</constant>
         <constant digits="0" name="idlerpmpid_iTermMax" units="">20.0</constant>
         <constant digits="0" name="etbIdleThrottleRange" units="%">15.0</constant>
-        <constant digits="0" name="cylinderBankSelect1" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect2" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect3" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect4" units="">0.0</constant>
+        <constant digits="0" name="cylinderBankSelect1" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect2" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect3" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect4" units="">1.0</constant>
         <constant digits="0" name="cylinderBankSelect5" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect6" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect7" units="">0.0</constant>
@@ -1340,24 +1265,6 @@
         <constant name="tcu_solenoid_mode4">"default"</constant>
         <constant name="tcu_solenoid_mode5">"default"</constant>
         <constant name="tcu_solenoid_mode6">"default"</constant>
-        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-</constant>
         <constant digits="3" name="triggerGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom2" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom3" units="ratio">0.0</constant>
@@ -1397,13 +1304,8 @@
         <constant digits="0" name="maxCamPhaseResolveRpm" units="rpm">0.0</constant>
         <constant digits="1" name="dfcoDelay" units="sec">0.0</constant>
         <constant digits="1" name="acDelay" units="sec">0.5</constant>
+        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="3" name="fordInjectorSmallPulseBreakPoint" units="mg">0.0</constant>
-        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="etbJamIntegratorLimit" units="%">0.0</constant>
         <constant digits="0" name="hpfpCamLobes" units="lobes/cam">3.0</constant>
         <constant name="hpfpCam">"NONE"</constant>
@@ -1415,134 +1317,6 @@
         <constant digits="3" name="hpfpPidP" units="%/kPa">0.01</constant>
         <constant digits="5" name="hpfpPidI" units="%/kPa/lobe">3.0E-4</constant>
         <constant digits="0" name="hpfpTargetDecay" units="kPa/s">2000.0</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
-         0.0
-         1.0
-         4.5
-         9.5
-         16.5
-         25.0
-         34.5
-         45.0
-         55.0
-         65.5
-         75.0
-         83.5
-         90.5
-         95.5
-         99.0
-         100.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
-         0.0
-         7.5
-         16.5
-         24.0
-         32.0
-         40.0
-         48.0
-         56.0
-         64.0
-         72.0
-         80.0
-         88.0
-         96.0
-         103.5
-         112.5
-         120.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         15.0
-         16.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-         120.0
-         140.0
-         160.0
-         180.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
-         0.005
-         0.018
-         0.031
-         0.043
-         0.056
-         0.069
-         0.082
-         0.094
-         0.107
-         0.12
-</constant>
-        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
         <constant name="stepper_raw_output1">"NONE"</constant>
         <constant name="stepper_raw_output2">"NONE"</constant>
         <constant name="stepper_raw_output3">"NONE"</constant>
@@ -1558,66 +1332,6 @@
         <constant digits="2" name="gearRatio9" units="ratio">0.0</constant>
         <constant digits="2" name="gearRatio10" units="ratio">0.0</constant>
         <constant digits="0" name="vvtActivationDelayMs" units="ms">6000.0</constant>
-        <constant cols="1" digits="0" name="wwCltBins" rows="8">
-         -40.0
-         -20.0
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
-         1.45
-         1.3
-         1.17
-         1.05
-         0.9
-         0.82
-         0.75
-         0.7
-</constant>
-        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
-         0.73
-         0.66
-         0.57
-         0.46
-         0.38
-         0.31
-         0.24
-         0.19
-</constant>
-        <constant cols="1" digits="0" name="wwMapBins" rows="8">
-         10.0
-         20.0
-         30.0
-         40.0
-         50.0
-         60.0
-         70.0
-         80.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
-         0.38
-         0.55
-         0.69
-         0.86
-         0.9
-         0.95
-         0.97
-         1.0
-</constant>
-        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
-         0.21
-         0.4
-         0.6
-         0.79
-         0.85
-         0.9
-         0.95
-         1.0
-</constant>
         <constant cols="6" digits="0" name="torqueTable" rows="6">
          0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0
@@ -1703,7 +1417,6 @@
          0.0
          0.0
 </constant>
-        <constant digits="0" name="unused3124141" units="">0.0</constant>
         <constant name="fuelPressureSensorMode">"Absolute"</constant>
         <constant name="luaDigitalInputPins1">"NONE"</constant>
         <constant name="luaDigitalInputPins2">"NONE"</constant>
@@ -1713,12 +1426,6 @@
         <constant name="luaDigitalInputPins6">"NONE"</constant>
         <constant name="luaDigitalInputPins7">"NONE"</constant>
         <constant name="luaDigitalInputPins8">"NONE"</constant>
-        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
-         650.0
-         800.0
-         3750.0
-         7000.0
-</constant>
         <constant digits="0" name="ALSMinRPM" units="rpm">400.0</constant>
         <constant digits="0" name="ALSMaxRPM" units="rpm">3200.0</constant>
         <constant digits="0" name="ALSMaxDuration" units="sec">3.0</constant>
@@ -1894,7 +1601,124 @@
         <constant name="spi5MisoMode">"default"</constant>
         <constant name="spi6SckMode">"default"</constant>
         <constant name="spi6MosiMode">"default"</constant>
-        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="120">
+        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
+        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="236">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
          0.0
          0.0
          0.0
@@ -2380,40 +2204,22 @@
          0.0
          0.0
 </constant>
-        <constant cols="1" digits="0" name="unusedGapInCalibration" rows="32">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
+        <constant digits="0" name="fancyOptions1" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions2" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions3" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions4" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions5" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions6" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions7" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions8" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions9" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions10" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions11" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions12" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions13" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions14" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions15" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions16" units="">0.0</constant>
         <constant cols="8" digits="1" name="boostTableOpenLoop" rows="8">
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
@@ -4554,9 +4360,297 @@ end</constant>
          3600.0
          5000.0
          7000.0
+</constant>
+        <constant cols="1" digits="0" name="wwCltBins" rows="8">
+         -40.0
+         -20.0
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
+         1.45
+         1.3
+         1.17
+         1.05
+         0.9
+         0.82
+         0.75
+         0.7
+</constant>
+        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
+         0.73
+         0.66
+         0.57
+         0.46
+         0.38
+         0.31
+         0.24
+         0.19
+</constant>
+        <constant cols="1" digits="0" name="wwMapBins" rows="8">
+         10.0
+         20.0
+         30.0
+         40.0
+         50.0
+         60.0
+         70.0
+         80.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
+         0.38
+         0.55
+         0.69
+         0.86
+         0.9
+         0.95
+         0.97
+         1.0
+</constant>
+        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
+         0.21
+         0.4
+         0.6
+         0.79
+         0.85
+         0.9
+         0.95
+         1.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
+         0.0
+         1.0
+         4.5
+         9.5
+         16.5
+         25.0
+         34.5
+         45.0
+         55.0
+         65.5
+         75.0
+         83.5
+         90.5
+         95.5
+         99.0
+         100.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
+         0.0
+         7.5
+         16.5
+         24.0
+         32.0
+         40.0
+         48.0
+         56.0
+         64.0
+         72.0
+         80.0
+         88.0
+         96.0
+         103.5
+         112.5
+         120.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         15.0
+         16.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+         120.0
+         140.0
+         160.0
+         180.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
+         0.005
+         0.018
+         0.031
+         0.043
+         0.056
+         0.069
+         0.082
+         0.094
+         0.107
+         0.12
+</constant>
+        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
+         650.0
+         800.0
+         1100.0
+         1400.0
+         1700.0
+         2000.0
+         2300.0
+         2600.0
+         2900.0
+         3200.0
+         3500.0
+         3800.0
+         4100.0
+         4400.0
+         4700.0
+         7000.0
+</constant>
+        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+</constant>
+        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
+         650.0
+         800.0
+         3750.0
+         7000.0
+</constant>
+        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
+         1.0
+         1.0
+         1.0
+         1.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
+         -20.0
+         0.0
+         40.0
+         80.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
+         0.0
+         0.71
+         1.43
+         2.14
+         2.86
+         3.57
+         4.29
+         5.0
+</constant>
+        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         14.0
+         15.0
+</constant>
+        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.19.XXX.4275859823" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.22.XXX.4019883890" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_HONDA_OBD1.msq b/generated/simulator_tune_HONDA_OBD1.msq
index acdd050..78d1898 100644
--- a/generated/simulator_tune_HONDA_OBD1.msq
+++ b/generated/simulator_tune_HONDA_OBD1.msq
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <msq xmlns="http://www.msefi.com/:msq">
     <page/>
-    <page number="0" size="22428">
+    <page number="0" size="22400">
         <constant name="engineType">"HONDA_OBD1"</constant>
         <constant digits="0" name="startButtonSuppressOnStartUpMs" units="">0.0</constant>
         <constant digits="0" name="sensorSnifferRpmThreshold" units="RPM">2500.0</constant>
@@ -12,26 +12,25 @@
         <constant digits="0" name="maxAcRpm" units="rpm">5000.0</constant>
         <constant digits="0" name="maxAcTps" units="%">75.0</constant>
         <constant digits="0" name="maxAcClt" units="deg C">100.0</constant>
-        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
-         650.0
-         800.0
-         1100.0
-         1400.0
-         1700.0
-         2000.0
-         2300.0
-         2600.0
-         2900.0
-         3200.0
-         3500.0
-         3800.0
-         4100.0
-         4400.0
-         4700.0
-         7000.0
-</constant>
+        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
+        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
+        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
+        <constant name="mainRelayPin">"NONE"</constant>
+        <constant name="sdCardCsPin">"NONE"</constant>
+        <constant name="canTxPin">"NONE"</constant>
+        <constant name="canRxPin">"NONE"</constant>
+        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
+        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
+        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
+        <constant name="tachOutputPin">"NONE"</constant>
+        <constant name="tachOutputPinMode">"default"</constant>
+        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
+        <constant digits="0" name="manIdlePosition" units="%">50.0</constant>
         <constant digits="0" name="multisparkMaxSparkingAngle" units="deg">30.0</constant>
         <constant digits="0" name="multisparkMaxExtraSparkCount" units="count">2.0</constant>
+        <constant digits="0" name="vvtControlMinRpm" units="RPM">500.0</constant>
         <constant digits="2" name="injector_flow" units="cm3/min">248.0</constant>
         <constant cols="1" digits="2" name="injector_battLagCorrBins" rows="8">
          6.0
@@ -182,6 +181,7 @@
         <constant digits="0" name="triggerSimulatorRpm" units="RPM">1200.0</constant>
         <constant digits="0" name="cylindersCount" units="">4.0</constant>
         <constant name="firingOrder">"1-3-4-2"</constant>
+        <constant digits="0" name="justATempTest" units="">0.0</constant>
         <constant name="communityCommsLedPid">"NONE"</constant>
         <constant digits="2" name="cylinderBore" units="mm">87.5</constant>
         <constant name="fuelAlgorithm">"Speed Density"</constant>
@@ -195,8 +195,10 @@
         <constant name="ignitionMode">"Single Coil"</constant>
         <constant digits="0" name="gapTrackingLengthOverride" units="count">0.0</constant>
         <constant digits="0" name="maxIdleVss" units="kph">0.0</constant>
+        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
         <constant digits="0" name="minOilPressureAfterStart" units="kPa">0.0</constant>
         <constant name="timingMode">"dynamic"</constant>
+        <constant name="canNbcType">"None"</constant>
         <constant digits="0" name="fixedModeTiming" units="RPM">50.0</constant>
         <constant digits="0" name="globalTriggerAngleOffset" units="deg btdc">80.0</constant>
         <constant digits="2" name="analogInputDividerCoefficient" units="coef">2.0</constant>
@@ -205,12 +207,7 @@
         <constant digits="0" name="fanOffTemperature" units="deg C">88.0</constant>
         <constant name="acrPin">"NONE"</constant>
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">1000.0</constant>
-        <constant name="canNbcType">"None"</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
-        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
-        <constant digits="0" name="justATempTest" units="">0.0</constant>
-        <constant digits="0" name="unusedHere333" units="">0.0</constant>
-        <constant digits="0" name="unusedHere334" units="">0.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
         <constant name="tps1_1AdcChannel">"Disabled"</constant>
         <constant name="vbattAdcChannel">"Disabled"</constant>
@@ -226,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.0240319E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240322E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -254,12 +251,12 @@
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
         <constant name="idle_stepperStepPin">"NONE"</constant>
         <constant name="idle_solenoidPinMode">"default"</constant>
-        <constant digits="0" name="manIdlePosition" units="%">50.0</constant>
         <constant digits="1" name="knockRetardAggression" units="%">20.0</constant>
         <constant digits="1" name="knockRetardReapplyRate" units="deg/s">3.0</constant>
         <constant name="engineSyncCam">"Intake First Bank"</constant>
-        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
+        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="3" name="vssGearRatio" units="ratio">3.73</constant>
+        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
         <constant digits="0" name="vssToothCount" units="count">21.0</constant>
         <constant name="idleVeOverrideMode">"None"</constant>
         <constant name="l9779_cs">"NONE"</constant>
@@ -308,22 +305,13 @@
         <constant name="max31855spiDevice">"Off"</constant>
         <constant name="debugTriggerSync">"NONE"</constant>
         <constant name="digitalPotentiometerSpiDevice">"Off"</constant>
+        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
         <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
         <constant name="tps1_2AdcChannel">"Disabled"</constant>
         <constant name="tps2_2AdcChannel">"Disabled"</constant>
         <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
-        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -331,23 +319,10 @@
         <constant name="triggerInputPins2">"NONE"</constant>
         <constant digits="0" name="mc33_t_min_boost" units="us">100.0</constant>
         <constant name="hip9011CsPinMode">"default"</constant>
-        <constant name="tachOutputPin">"NONE"</constant>
-        <constant name="tachOutputPinMode">"default"</constant>
-        <constant name="mainRelayPin">"NONE"</constant>
-        <constant name="sdCardCsPin">"NONE"</constant>
-        <constant name="canTxPin">"NONE"</constant>
-        <constant name="canRxPin">"NONE"</constant>
         <constant name="throttlePedalUpPinMode">"DEFAULT"</constant>
-        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
         <constant digits="2" name="finalGearRatio" units="ratio">1.0</constant>
         <constant name="tcuInputSpeedSensorPin">"NONE"</constant>
         <constant digits="0" name="tcuInputSpeedSensorTeeth" units="">1.0</constant>
-        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
-        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
         <constant name="triggerSimulatorPins1">"NONE"</constant>
         <constant name="triggerSimulatorPins2">"NONE"</constant>
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
@@ -403,27 +378,7 @@
         <constant name="acFanPin">"NONE"</constant>
         <constant name="acFanPinMode">"default"</constant>
         <constant name="l9779spiDevice">"Off"</constant>
-        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         14.0
-         15.0
-</constant>
         <constant name="imuType">"None"</constant>
-        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="vehicleWeight" units="kg">0.0</constant>
         <constant digits="0" name="idlePidRpmUpperLimit" units="RPM">300.0</constant>
         <constant digits="3" name="applyNonlinearBelowPulse" units="ms">0.0</constant>
@@ -454,6 +409,8 @@
         <constant name="starterRelayDisablePinMode">"default"</constant>
         <constant name="secondSolenoidPin">"NONE"</constant>
         <constant name="startStopButtonPin">"NONE"</constant>
+        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
+        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="0" name="mapMinBufferLength" units="count">1.0</constant>
         <constant digits="0" name="idlePidDeactivationTpsThreshold" units="%">5.0</constant>
         <constant digits="0" name="stepperParkingExtraSteps" units="%">0.0</constant>
@@ -466,8 +423,6 @@
         <constant name="acRelayPin">"NONE"</constant>
         <constant digits="0" name="lambdaProtectionMinTps" units="%">50.0</constant>
         <constant digits="1" name="lambdaProtectionTimeout" units="s">0.5</constant>
-        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
-        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="2" name="scriptSetting1" units="">0.0</constant>
         <constant digits="2" name="scriptSetting2" units="">0.0</constant>
         <constant digits="2" name="scriptSetting3" units="">0.0</constant>
@@ -546,6 +501,8 @@
         <constant digits="0" name="boostPwmFrequency" units="Hz">33.0</constant>
         <constant name="launchActivationMode">"Launch Button"</constant>
         <constant name="antiLagActivationMode">"Switch Input"</constant>
+        <constant digits="2" name="tpsAccelLookback" units="sec">0.0</constant>
+        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="0" name="launchSpeedThreshold" units="Kph">30.0</constant>
         <constant digits="0" name="launchRpmWindow" units="RPM">500.0</constant>
         <constant digits="0" name="launchSparkSkipPercent" units="%">0.0</constant>
@@ -595,16 +552,6 @@
         <constant name="drv8860_cs">"NONE"</constant>
         <constant name="drv8860_csPinMode">"default"</constant>
         <constant name="drv8860_miso">"NONE"</constant>
-        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
-         0.0
-         0.71
-         1.43
-         2.14
-         2.86
-         3.57
-         4.29
-         5.0
-</constant>
         <constant name="luaOutputPins1">"NONE"</constant>
         <constant name="luaOutputPins2">"NONE"</constant>
         <constant name="luaOutputPins3">"NONE"</constant>
@@ -810,10 +757,8 @@
         <constant name="auxSerialTxPin">"NONE"</constant>
         <constant name="auxSerialRxPin">"NONE"</constant>
         <constant name="accelerometerCsPin">"NONE"</constant>
-        <constant digits="2" name="tpsAccelLookback" units="sec">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssLow" units="kph">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssHigh" units="kph">0.0</constant>
-        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="1" name="tpsAccelEnrichmentThreshold" units="roc">40.0</constant>
         <constant name="auxSpeedSensorInputPin1">"NONE"</constant>
         <constant name="auxSpeedSensorInputPin2">"NONE"</constant>
@@ -902,7 +847,6 @@
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
-        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="0" name="crankingIACposition" units="percent">50.0</constant>
         <constant digits="4" name="tChargeMinRpmMinTps" units="">0.25</constant>
         <constant digits="4" name="tChargeMinRpmMaxTps" units="">0.25</constant>
@@ -1020,7 +964,6 @@
         <constant name="mc33816_rstb">"NONE"</constant>
         <constant name="mc33816_driven">"NONE"</constant>
         <constant name="brakePedalPin">"NONE"</constant>
-        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant digits="4" name="auxPid1_pFactor" units="">2.0</constant>
         <constant digits="4" name="auxPid1_iFactor" units="">0.005</constant>
         <constant digits="4" name="auxPid1_dFactor" units="">0.0</constant>
@@ -1067,12 +1010,7 @@
         <constant name="tle8888_csPinMode">"default"</constant>
         <constant name="mc33816_cs">"NONE"</constant>
         <constant digits="1" name="auxFrequencyFilter" units="hz">0.0</constant>
-        <constant digits="0" name="vvtControlMinRpm" units="RPM">500.0</constant>
         <constant name="sentInputPins1">"NONE"</constant>
-        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
-        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
-        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
-        <constant digits="0" name="unused645646" units="">0.0</constant>
         <constant digits="0" name="coastingFuelCutRpmHigh" units="rpm">1500.0</constant>
         <constant digits="0" name="coastingFuelCutRpmLow" units="rpm">1300.0</constant>
         <constant digits="0" name="coastingFuelCutTps" units="%">2.0</constant>
@@ -1089,24 +1027,11 @@
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value2" units="">0.0</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
-         -20.0
-         0.0
-         40.0
-         80.0
-</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant digits="3" name="tChargeAirCoefMin" units="">0.098</constant>
         <constant digits="3" name="tChargeAirCoefMax" units="">0.902</constant>
         <constant digits="1" name="tChargeAirFlowMax" units="kg/h">153.6</constant>
         <constant digits="1" name="tChargeAirIncrLimit" units="deg/sec">1.0</constant>
         <constant digits="1" name="tChargeAirDecrLimit" units="deg/sec">12.5</constant>
-        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="2" name="hip9011Gain" units="">1.0</constant>
         <constant digits="0" name="etb_iTermMin" units="">-30.0</constant>
         <constant digits="0" name="etb_iTermMax" units="">30.0</constant>
@@ -1128,10 +1053,10 @@
         <constant digits="1" name="stoichRatioPrimary" units=":1">14.7</constant>
         <constant digits="0" name="idlerpmpid_iTermMax" units="">20.0</constant>
         <constant digits="0" name="etbIdleThrottleRange" units="%">15.0</constant>
-        <constant digits="0" name="cylinderBankSelect1" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect2" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect3" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect4" units="">0.0</constant>
+        <constant digits="0" name="cylinderBankSelect1" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect2" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect3" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect4" units="">1.0</constant>
         <constant digits="0" name="cylinderBankSelect5" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect6" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect7" units="">0.0</constant>
@@ -1339,24 +1264,6 @@
         <constant name="tcu_solenoid_mode4">"default"</constant>
         <constant name="tcu_solenoid_mode5">"default"</constant>
         <constant name="tcu_solenoid_mode6">"default"</constant>
-        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-</constant>
         <constant digits="3" name="triggerGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom2" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom3" units="ratio">0.0</constant>
@@ -1396,13 +1303,8 @@
         <constant digits="0" name="maxCamPhaseResolveRpm" units="rpm">0.0</constant>
         <constant digits="1" name="dfcoDelay" units="sec">0.0</constant>
         <constant digits="1" name="acDelay" units="sec">0.5</constant>
+        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="3" name="fordInjectorSmallPulseBreakPoint" units="mg">0.0</constant>
-        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="etbJamIntegratorLimit" units="%">0.0</constant>
         <constant digits="0" name="hpfpCamLobes" units="lobes/cam">3.0</constant>
         <constant name="hpfpCam">"NONE"</constant>
@@ -1414,134 +1316,6 @@
         <constant digits="3" name="hpfpPidP" units="%/kPa">0.01</constant>
         <constant digits="5" name="hpfpPidI" units="%/kPa/lobe">3.0E-4</constant>
         <constant digits="0" name="hpfpTargetDecay" units="kPa/s">2000.0</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
-         0.0
-         1.0
-         4.5
-         9.5
-         16.5
-         25.0
-         34.5
-         45.0
-         55.0
-         65.5
-         75.0
-         83.5
-         90.5
-         95.5
-         99.0
-         100.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
-         0.0
-         7.5
-         16.5
-         24.0
-         32.0
-         40.0
-         48.0
-         56.0
-         64.0
-         72.0
-         80.0
-         88.0
-         96.0
-         103.5
-         112.5
-         120.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         15.0
-         16.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-         120.0
-         140.0
-         160.0
-         180.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
-         0.005
-         0.018
-         0.031
-         0.043
-         0.056
-         0.069
-         0.082
-         0.094
-         0.107
-         0.12
-</constant>
-        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
         <constant name="stepper_raw_output1">"NONE"</constant>
         <constant name="stepper_raw_output2">"NONE"</constant>
         <constant name="stepper_raw_output3">"NONE"</constant>
@@ -1557,66 +1331,6 @@
         <constant digits="2" name="gearRatio9" units="ratio">0.0</constant>
         <constant digits="2" name="gearRatio10" units="ratio">0.0</constant>
         <constant digits="0" name="vvtActivationDelayMs" units="ms">6000.0</constant>
-        <constant cols="1" digits="0" name="wwCltBins" rows="8">
-         -40.0
-         -20.0
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
-         1.45
-         1.3
-         1.17
-         1.05
-         0.9
-         0.82
-         0.75
-         0.7
-</constant>
-        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
-         0.73
-         0.66
-         0.57
-         0.46
-         0.38
-         0.31
-         0.24
-         0.19
-</constant>
-        <constant cols="1" digits="0" name="wwMapBins" rows="8">
-         10.0
-         20.0
-         30.0
-         40.0
-         50.0
-         60.0
-         70.0
-         80.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
-         0.38
-         0.55
-         0.69
-         0.86
-         0.9
-         0.95
-         0.97
-         1.0
-</constant>
-        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
-         0.21
-         0.4
-         0.6
-         0.79
-         0.85
-         0.9
-         0.95
-         1.0
-</constant>
         <constant cols="6" digits="0" name="torqueTable" rows="6">
          0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0
@@ -1702,7 +1416,6 @@
          0.0
          0.0
 </constant>
-        <constant digits="0" name="unused3124141" units="">0.0</constant>
         <constant name="fuelPressureSensorMode">"Absolute"</constant>
         <constant name="luaDigitalInputPins1">"NONE"</constant>
         <constant name="luaDigitalInputPins2">"NONE"</constant>
@@ -1712,12 +1425,6 @@
         <constant name="luaDigitalInputPins6">"NONE"</constant>
         <constant name="luaDigitalInputPins7">"NONE"</constant>
         <constant name="luaDigitalInputPins8">"NONE"</constant>
-        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
-         650.0
-         800.0
-         3750.0
-         7000.0
-</constant>
         <constant digits="0" name="ALSMinRPM" units="rpm">400.0</constant>
         <constant digits="0" name="ALSMaxRPM" units="rpm">3200.0</constant>
         <constant digits="0" name="ALSMaxDuration" units="sec">3.0</constant>
@@ -1893,7 +1600,124 @@
         <constant name="spi5MisoMode">"default"</constant>
         <constant name="spi6SckMode">"default"</constant>
         <constant name="spi6MosiMode">"default"</constant>
-        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="120">
+        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
+        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="236">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
          0.0
          0.0
          0.0
@@ -2379,40 +2203,22 @@
          0.0
          0.0
 </constant>
-        <constant cols="1" digits="0" name="unusedGapInCalibration" rows="32">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
+        <constant digits="0" name="fancyOptions1" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions2" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions3" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions4" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions5" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions6" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions7" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions8" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions9" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions10" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions11" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions12" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions13" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions14" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions15" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions16" units="">0.0</constant>
         <constant cols="8" digits="1" name="boostTableOpenLoop" rows="8">
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
@@ -4553,9 +4359,297 @@ end</constant>
          3600.0
          5000.0
          7000.0
+</constant>
+        <constant cols="1" digits="0" name="wwCltBins" rows="8">
+         -40.0
+         -20.0
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
+         1.45
+         1.3
+         1.17
+         1.05
+         0.9
+         0.82
+         0.75
+         0.7
+</constant>
+        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
+         0.73
+         0.66
+         0.57
+         0.46
+         0.38
+         0.31
+         0.24
+         0.19
+</constant>
+        <constant cols="1" digits="0" name="wwMapBins" rows="8">
+         10.0
+         20.0
+         30.0
+         40.0
+         50.0
+         60.0
+         70.0
+         80.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
+         0.38
+         0.55
+         0.69
+         0.86
+         0.9
+         0.95
+         0.97
+         1.0
+</constant>
+        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
+         0.21
+         0.4
+         0.6
+         0.79
+         0.85
+         0.9
+         0.95
+         1.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
+         0.0
+         1.0
+         4.5
+         9.5
+         16.5
+         25.0
+         34.5
+         45.0
+         55.0
+         65.5
+         75.0
+         83.5
+         90.5
+         95.5
+         99.0
+         100.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
+         0.0
+         7.5
+         16.5
+         24.0
+         32.0
+         40.0
+         48.0
+         56.0
+         64.0
+         72.0
+         80.0
+         88.0
+         96.0
+         103.5
+         112.5
+         120.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         15.0
+         16.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+         120.0
+         140.0
+         160.0
+         180.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
+         0.005
+         0.018
+         0.031
+         0.043
+         0.056
+         0.069
+         0.082
+         0.094
+         0.107
+         0.12
+</constant>
+        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
+         650.0
+         800.0
+         1100.0
+         1400.0
+         1700.0
+         2000.0
+         2300.0
+         2600.0
+         2900.0
+         3200.0
+         3500.0
+         3800.0
+         4100.0
+         4400.0
+         4700.0
+         7000.0
+</constant>
+        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+</constant>
+        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
+         650.0
+         800.0
+         3750.0
+         7000.0
+</constant>
+        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
+         1.0
+         1.0
+         1.0
+         1.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
+         -20.0
+         0.0
+         40.0
+         80.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
+         0.0
+         0.71
+         1.43
+         2.14
+         2.86
+         3.57
+         4.29
+         5.0
+</constant>
+        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         14.0
+         15.0
+</constant>
+        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.19.XXX.4275859823" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.22.XXX.4019883890" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_HYUNDAI_PB.msq b/generated/simulator_tune_HYUNDAI_PB.msq
index 44f5511..04143de 100644
--- a/generated/simulator_tune_HYUNDAI_PB.msq
+++ b/generated/simulator_tune_HYUNDAI_PB.msq
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <msq xmlns="http://www.msefi.com/:msq">
     <page/>
-    <page number="0" size="22428">
+    <page number="0" size="22400">
         <constant name="engineType">"HYUNDAI_PB"</constant>
         <constant digits="0" name="startButtonSuppressOnStartUpMs" units="">0.0</constant>
         <constant digits="0" name="sensorSnifferRpmThreshold" units="RPM">2500.0</constant>
@@ -12,26 +12,25 @@
         <constant digits="0" name="maxAcRpm" units="rpm">5000.0</constant>
         <constant digits="0" name="maxAcTps" units="%">75.0</constant>
         <constant digits="0" name="maxAcClt" units="deg C">100.0</constant>
-        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
-         650.0
-         800.0
-         1100.0
-         1400.0
-         1700.0
-         2000.0
-         2300.0
-         2600.0
-         2900.0
-         3200.0
-         3500.0
-         3800.0
-         4100.0
-         4400.0
-         4700.0
-         7000.0
-</constant>
+        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
+        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
+        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
+        <constant name="mainRelayPin">"NONE"</constant>
+        <constant name="sdCardCsPin">"NONE"</constant>
+        <constant name="canTxPin">"NONE"</constant>
+        <constant name="canRxPin">"NONE"</constant>
+        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
+        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
+        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
+        <constant name="tachOutputPin">"PG2"</constant>
+        <constant name="tachOutputPinMode">"default"</constant>
+        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
+        <constant digits="0" name="manIdlePosition" units="%">50.0</constant>
         <constant digits="0" name="multisparkMaxSparkingAngle" units="deg">30.0</constant>
         <constant digits="0" name="multisparkMaxExtraSparkCount" units="count">2.0</constant>
+        <constant digits="0" name="vvtControlMinRpm" units="RPM">1500.0</constant>
         <constant digits="2" name="injector_flow" units="cm3/min">1214.0</constant>
         <constant cols="1" digits="2" name="injector_battLagCorrBins" rows="8">
          6.0
@@ -182,6 +181,7 @@
         <constant digits="0" name="triggerSimulatorRpm" units="RPM">1200.0</constant>
         <constant digits="0" name="cylindersCount" units="">4.0</constant>
         <constant name="firingOrder">"1-3-4-2"</constant>
+        <constant digits="0" name="justATempTest" units="">0.0</constant>
         <constant name="communityCommsLedPid">"NONE"</constant>
         <constant digits="2" name="cylinderBore" units="mm">87.5</constant>
         <constant name="fuelAlgorithm">"Speed Density"</constant>
@@ -195,8 +195,10 @@
         <constant name="ignitionMode">"Individual Coils"</constant>
         <constant digits="0" name="gapTrackingLengthOverride" units="count">0.0</constant>
         <constant digits="0" name="maxIdleVss" units="kph">0.0</constant>
+        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
         <constant digits="0" name="minOilPressureAfterStart" units="kPa">0.0</constant>
         <constant name="timingMode">"dynamic"</constant>
+        <constant name="canNbcType">"None"</constant>
         <constant digits="0" name="fixedModeTiming" units="RPM">50.0</constant>
         <constant digits="0" name="globalTriggerAngleOffset" units="deg btdc">115.0</constant>
         <constant digits="2" name="analogInputDividerCoefficient" units="coef">2.0</constant>
@@ -205,12 +207,7 @@
         <constant digits="0" name="fanOffTemperature" units="deg C">88.0</constant>
         <constant name="acrPin">"NONE"</constant>
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">1000.0</constant>
-        <constant name="canNbcType">"None"</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
-        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
-        <constant digits="0" name="justATempTest" units="">0.0</constant>
-        <constant digits="0" name="unusedHere333" units="">0.0</constant>
-        <constant digits="0" name="unusedHere334" units="">0.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
         <constant name="tps1_1AdcChannel">"Disabled"</constant>
         <constant name="vbattAdcChannel">"Disabled"</constant>
@@ -226,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.0240319E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240322E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"PC6"</constant>
@@ -254,12 +251,12 @@
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
         <constant name="idle_stepperStepPin">"NONE"</constant>
         <constant name="idle_solenoidPinMode">"default"</constant>
-        <constant digits="0" name="manIdlePosition" units="%">50.0</constant>
         <constant digits="1" name="knockRetardAggression" units="%">20.0</constant>
         <constant digits="1" name="knockRetardReapplyRate" units="deg/s">3.0</constant>
         <constant name="engineSyncCam">"Intake First Bank"</constant>
-        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
+        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="3" name="vssGearRatio" units="ratio">3.73</constant>
+        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
         <constant digits="0" name="vssToothCount" units="count">21.0</constant>
         <constant name="idleVeOverrideMode">"None"</constant>
         <constant name="l9779_cs">"NONE"</constant>
@@ -308,22 +305,13 @@
         <constant name="max31855spiDevice">"Off"</constant>
         <constant name="debugTriggerSync">"NONE"</constant>
         <constant name="digitalPotentiometerSpiDevice">"Off"</constant>
+        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
         <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
         <constant name="tps1_2AdcChannel">"Disabled"</constant>
         <constant name="tps2_2AdcChannel">"Disabled"</constant>
         <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
-        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -331,23 +319,10 @@
         <constant name="triggerInputPins2">"NONE"</constant>
         <constant digits="0" name="mc33_t_min_boost" units="us">100.0</constant>
         <constant name="hip9011CsPinMode">"default"</constant>
-        <constant name="tachOutputPin">"PG2"</constant>
-        <constant name="tachOutputPinMode">"default"</constant>
-        <constant name="mainRelayPin">"NONE"</constant>
-        <constant name="sdCardCsPin">"NONE"</constant>
-        <constant name="canTxPin">"NONE"</constant>
-        <constant name="canRxPin">"NONE"</constant>
         <constant name="throttlePedalUpPinMode">"DEFAULT"</constant>
-        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
         <constant digits="2" name="finalGearRatio" units="ratio">1.0</constant>
         <constant name="tcuInputSpeedSensorPin">"NONE"</constant>
         <constant digits="0" name="tcuInputSpeedSensorTeeth" units="">1.0</constant>
-        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
-        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
         <constant name="triggerSimulatorPins1">"NONE"</constant>
         <constant name="triggerSimulatorPins2">"NONE"</constant>
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
@@ -403,27 +378,7 @@
         <constant name="acFanPin">"NONE"</constant>
         <constant name="acFanPinMode">"default"</constant>
         <constant name="l9779spiDevice">"Off"</constant>
-        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         14.0
-         15.0
-</constant>
         <constant name="imuType">"None"</constant>
-        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="vehicleWeight" units="kg">0.0</constant>
         <constant digits="0" name="idlePidRpmUpperLimit" units="RPM">300.0</constant>
         <constant digits="3" name="applyNonlinearBelowPulse" units="ms">0.0</constant>
@@ -454,6 +409,8 @@
         <constant name="starterRelayDisablePinMode">"default"</constant>
         <constant name="secondSolenoidPin">"NONE"</constant>
         <constant name="startStopButtonPin">"PA1"</constant>
+        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
+        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="0" name="mapMinBufferLength" units="count">1.0</constant>
         <constant digits="0" name="idlePidDeactivationTpsThreshold" units="%">5.0</constant>
         <constant digits="0" name="stepperParkingExtraSteps" units="%">0.0</constant>
@@ -466,8 +423,6 @@
         <constant name="acRelayPin">"NONE"</constant>
         <constant digits="0" name="lambdaProtectionMinTps" units="%">50.0</constant>
         <constant digits="1" name="lambdaProtectionTimeout" units="s">0.5</constant>
-        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
-        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="2" name="scriptSetting1" units="">0.0</constant>
         <constant digits="2" name="scriptSetting2" units="">0.0</constant>
         <constant digits="2" name="scriptSetting3" units="">0.0</constant>
@@ -546,6 +501,8 @@
         <constant digits="0" name="boostPwmFrequency" units="Hz">33.0</constant>
         <constant name="launchActivationMode">"Launch Button"</constant>
         <constant name="antiLagActivationMode">"Switch Input"</constant>
+        <constant digits="2" name="tpsAccelLookback" units="sec">0.0</constant>
+        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="0" name="launchSpeedThreshold" units="Kph">30.0</constant>
         <constant digits="0" name="launchRpmWindow" units="RPM">500.0</constant>
         <constant digits="0" name="launchSparkSkipPercent" units="%">0.0</constant>
@@ -596,16 +553,6 @@
         <constant name="drv8860_cs">"NONE"</constant>
         <constant name="drv8860_csPinMode">"default"</constant>
         <constant name="drv8860_miso">"NONE"</constant>
-        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
-         0.0
-         0.71
-         1.43
-         2.14
-         2.86
-         3.57
-         4.29
-         5.0
-</constant>
         <constant name="luaOutputPins1">"NONE"</constant>
         <constant name="luaOutputPins2">"NONE"</constant>
         <constant name="luaOutputPins3">"NONE"</constant>
@@ -811,10 +758,8 @@
         <constant name="auxSerialTxPin">"NONE"</constant>
         <constant name="auxSerialRxPin">"NONE"</constant>
         <constant name="accelerometerCsPin">"NONE"</constant>
-        <constant digits="2" name="tpsAccelLookback" units="sec">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssLow" units="kph">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssHigh" units="kph">0.0</constant>
-        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="1" name="tpsAccelEnrichmentThreshold" units="roc">40.0</constant>
         <constant name="auxSpeedSensorInputPin1">"NONE"</constant>
         <constant name="auxSpeedSensorInputPin2">"NONE"</constant>
@@ -903,7 +848,6 @@
         <constant name="vvtPins2">"PE2"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
-        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="0" name="crankingIACposition" units="percent">50.0</constant>
         <constant digits="4" name="tChargeMinRpmMinTps" units="">0.25</constant>
         <constant digits="4" name="tChargeMinRpmMaxTps" units="">0.25</constant>
@@ -1021,7 +965,6 @@
         <constant name="mc33816_rstb">"NONE"</constant>
         <constant name="mc33816_driven">"NONE"</constant>
         <constant name="brakePedalPin">"NONE"</constant>
-        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant digits="4" name="auxPid1_pFactor" units="">2.0</constant>
         <constant digits="4" name="auxPid1_iFactor" units="">0.005</constant>
         <constant digits="4" name="auxPid1_dFactor" units="">0.0</constant>
@@ -1068,12 +1011,7 @@
         <constant name="tle8888_csPinMode">"default"</constant>
         <constant name="mc33816_cs">"NONE"</constant>
         <constant digits="1" name="auxFrequencyFilter" units="hz">0.0</constant>
-        <constant digits="0" name="vvtControlMinRpm" units="RPM">1500.0</constant>
         <constant name="sentInputPins1">"NONE"</constant>
-        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
-        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
-        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
-        <constant digits="0" name="unused645646" units="">0.0</constant>
         <constant digits="0" name="coastingFuelCutRpmHigh" units="rpm">1500.0</constant>
         <constant digits="0" name="coastingFuelCutRpmLow" units="rpm">1300.0</constant>
         <constant digits="0" name="coastingFuelCutTps" units="%">2.0</constant>
@@ -1090,24 +1028,11 @@
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value2" units="">0.0</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
-         -20.0
-         0.0
-         40.0
-         80.0
-</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant digits="3" name="tChargeAirCoefMin" units="">0.098</constant>
         <constant digits="3" name="tChargeAirCoefMax" units="">0.902</constant>
         <constant digits="1" name="tChargeAirFlowMax" units="kg/h">153.6</constant>
         <constant digits="1" name="tChargeAirIncrLimit" units="deg/sec">1.0</constant>
         <constant digits="1" name="tChargeAirDecrLimit" units="deg/sec">12.5</constant>
-        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="2" name="hip9011Gain" units="">1.0</constant>
         <constant digits="0" name="etb_iTermMin" units="">-30.0</constant>
         <constant digits="0" name="etb_iTermMax" units="">30.0</constant>
@@ -1129,10 +1054,10 @@
         <constant digits="1" name="stoichRatioPrimary" units=":1">14.7</constant>
         <constant digits="0" name="idlerpmpid_iTermMax" units="">20.0</constant>
         <constant digits="0" name="etbIdleThrottleRange" units="%">6.0</constant>
-        <constant digits="0" name="cylinderBankSelect1" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect2" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect3" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect4" units="">0.0</constant>
+        <constant digits="0" name="cylinderBankSelect1" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect2" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect3" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect4" units="">1.0</constant>
         <constant digits="0" name="cylinderBankSelect5" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect6" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect7" units="">0.0</constant>
@@ -1340,24 +1265,6 @@
         <constant name="tcu_solenoid_mode4">"default"</constant>
         <constant name="tcu_solenoid_mode5">"default"</constant>
         <constant name="tcu_solenoid_mode6">"default"</constant>
-        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-</constant>
         <constant digits="3" name="triggerGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom2" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom3" units="ratio">0.0</constant>
@@ -1397,13 +1304,8 @@
         <constant digits="0" name="maxCamPhaseResolveRpm" units="rpm">0.0</constant>
         <constant digits="1" name="dfcoDelay" units="sec">0.0</constant>
         <constant digits="1" name="acDelay" units="sec">0.5</constant>
+        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="3" name="fordInjectorSmallPulseBreakPoint" units="mg">0.0</constant>
-        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="etbJamIntegratorLimit" units="%">0.0</constant>
         <constant digits="0" name="hpfpCamLobes" units="lobes/cam">4.0</constant>
         <constant name="hpfpCam">"NONE"</constant>
@@ -1415,134 +1317,6 @@
         <constant digits="3" name="hpfpPidP" units="%/kPa">0.01</constant>
         <constant digits="5" name="hpfpPidI" units="%/kPa/lobe">3.0E-4</constant>
         <constant digits="0" name="hpfpTargetDecay" units="kPa/s">2000.0</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
-         0.0
-         1.0
-         4.5
-         9.5
-         16.5
-         25.0
-         34.5
-         45.0
-         55.0
-         65.5
-         75.0
-         83.5
-         90.5
-         95.5
-         99.0
-         100.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
-         0.0
-         7.5
-         16.5
-         24.0
-         32.0
-         40.0
-         48.0
-         56.0
-         64.0
-         72.0
-         80.0
-         88.0
-         96.0
-         103.5
-         112.5
-         120.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         15.0
-         16.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-         120.0
-         140.0
-         160.0
-         180.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
-         0.005
-         0.018
-         0.031
-         0.043
-         0.056
-         0.069
-         0.082
-         0.094
-         0.107
-         0.12
-</constant>
-        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
         <constant name="stepper_raw_output1">"NONE"</constant>
         <constant name="stepper_raw_output2">"NONE"</constant>
         <constant name="stepper_raw_output3">"NONE"</constant>
@@ -1558,66 +1332,6 @@
         <constant digits="2" name="gearRatio9" units="ratio">0.0</constant>
         <constant digits="2" name="gearRatio10" units="ratio">0.0</constant>
         <constant digits="0" name="vvtActivationDelayMs" units="ms">6000.0</constant>
-        <constant cols="1" digits="0" name="wwCltBins" rows="8">
-         -40.0
-         -20.0
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
-         1.45
-         1.3
-         1.17
-         1.05
-         0.9
-         0.82
-         0.75
-         0.7
-</constant>
-        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
-         0.73
-         0.66
-         0.57
-         0.46
-         0.38
-         0.31
-         0.24
-         0.19
-</constant>
-        <constant cols="1" digits="0" name="wwMapBins" rows="8">
-         10.0
-         20.0
-         30.0
-         40.0
-         50.0
-         60.0
-         70.0
-         80.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
-         0.38
-         0.55
-         0.69
-         0.86
-         0.9
-         0.95
-         0.97
-         1.0
-</constant>
-        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
-         0.21
-         0.4
-         0.6
-         0.79
-         0.85
-         0.9
-         0.95
-         1.0
-</constant>
         <constant cols="6" digits="0" name="torqueTable" rows="6">
          0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0
@@ -1703,7 +1417,6 @@
          0.0
          0.0
 </constant>
-        <constant digits="0" name="unused3124141" units="">0.0</constant>
         <constant name="fuelPressureSensorMode">"Absolute"</constant>
         <constant name="luaDigitalInputPins1">"NONE"</constant>
         <constant name="luaDigitalInputPins2">"NONE"</constant>
@@ -1713,12 +1426,6 @@
         <constant name="luaDigitalInputPins6">"NONE"</constant>
         <constant name="luaDigitalInputPins7">"NONE"</constant>
         <constant name="luaDigitalInputPins8">"NONE"</constant>
-        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
-         650.0
-         800.0
-         3750.0
-         7000.0
-</constant>
         <constant digits="0" name="ALSMinRPM" units="rpm">400.0</constant>
         <constant digits="0" name="ALSMaxRPM" units="rpm">3200.0</constant>
         <constant digits="0" name="ALSMaxDuration" units="sec">3.0</constant>
@@ -1894,7 +1601,124 @@
         <constant name="spi5MisoMode">"default"</constant>
         <constant name="spi6SckMode">"default"</constant>
         <constant name="spi6MosiMode">"default"</constant>
-        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="120">
+        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
+        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="236">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
          0.0
          0.0
          0.0
@@ -2380,40 +2204,22 @@
          0.0
          0.0
 </constant>
-        <constant cols="1" digits="0" name="unusedGapInCalibration" rows="32">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
+        <constant digits="0" name="fancyOptions1" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions2" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions3" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions4" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions5" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions6" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions7" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions8" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions9" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions10" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions11" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions12" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions13" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions14" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions15" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions16" units="">0.0</constant>
         <constant cols="8" digits="1" name="boostTableOpenLoop" rows="8">
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
@@ -4644,9 +4450,297 @@ end</constant>
          3600.0
          5000.0
          7000.0
+</constant>
+        <constant cols="1" digits="0" name="wwCltBins" rows="8">
+         -40.0
+         -20.0
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
+         1.45
+         1.3
+         1.17
+         1.05
+         0.9
+         0.82
+         0.75
+         0.7
+</constant>
+        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
+         0.73
+         0.66
+         0.57
+         0.46
+         0.38
+         0.31
+         0.24
+         0.19
+</constant>
+        <constant cols="1" digits="0" name="wwMapBins" rows="8">
+         10.0
+         20.0
+         30.0
+         40.0
+         50.0
+         60.0
+         70.0
+         80.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
+         0.38
+         0.55
+         0.69
+         0.86
+         0.9
+         0.95
+         0.97
+         1.0
+</constant>
+        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
+         0.21
+         0.4
+         0.6
+         0.79
+         0.85
+         0.9
+         0.95
+         1.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
+         0.0
+         1.0
+         4.5
+         9.5
+         16.5
+         25.0
+         34.5
+         45.0
+         55.0
+         65.5
+         75.0
+         83.5
+         90.5
+         95.5
+         99.0
+         100.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
+         0.0
+         7.5
+         16.5
+         24.0
+         32.0
+         40.0
+         48.0
+         56.0
+         64.0
+         72.0
+         80.0
+         88.0
+         96.0
+         103.5
+         112.5
+         120.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         15.0
+         16.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+         120.0
+         140.0
+         160.0
+         180.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
+         0.005
+         0.018
+         0.031
+         0.043
+         0.056
+         0.069
+         0.082
+         0.094
+         0.107
+         0.12
+</constant>
+        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
+         650.0
+         800.0
+         1100.0
+         1400.0
+         1700.0
+         2000.0
+         2300.0
+         2600.0
+         2900.0
+         3200.0
+         3500.0
+         3800.0
+         4100.0
+         4400.0
+         4700.0
+         7000.0
+</constant>
+        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+</constant>
+        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
+         650.0
+         800.0
+         3750.0
+         7000.0
+</constant>
+        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
+         1.0
+         1.0
+         1.0
+         1.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
+         -20.0
+         0.0
+         40.0
+         80.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
+         0.0
+         0.71
+         1.43
+         2.14
+         2.86
+         3.57
+         4.29
+         5.0
+</constant>
+        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         14.0
+         15.0
+</constant>
+        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.19.XXX.4275859823" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.22.XXX.4019883890" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_MAVERICK_X3.msq b/generated/simulator_tune_MAVERICK_X3.msq
index c1c82ee..9e56e4b 100644
--- a/generated/simulator_tune_MAVERICK_X3.msq
+++ b/generated/simulator_tune_MAVERICK_X3.msq
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <msq xmlns="http://www.msefi.com/:msq">
     <page/>
-    <page number="0" size="22428">
+    <page number="0" size="22400">
         <constant name="engineType">"MAVERICK_X3"</constant>
         <constant digits="0" name="startButtonSuppressOnStartUpMs" units="">1000.0</constant>
         <constant digits="0" name="sensorSnifferRpmThreshold" units="RPM">2500.0</constant>
@@ -12,26 +12,25 @@
         <constant digits="0" name="maxAcRpm" units="rpm">5000.0</constant>
         <constant digits="0" name="maxAcTps" units="%">75.0</constant>
         <constant digits="0" name="maxAcClt" units="deg C">100.0</constant>
-        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
-         650.0
-         800.0
-         1100.0
-         1400.0
-         1700.0
-         2000.0
-         2300.0
-         2600.0
-         2900.0
-         3200.0
-         3500.0
-         3800.0
-         4100.0
-         4400.0
-         4700.0
-         7000.0
-</constant>
+        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
+        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
+        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
+        <constant name="mainRelayPin">"NONE"</constant>
+        <constant name="sdCardCsPin">"NONE"</constant>
+        <constant name="canTxPin">"NONE"</constant>
+        <constant name="canRxPin">"NONE"</constant>
+        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
+        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
+        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
+        <constant name="tachOutputPin">"NONE"</constant>
+        <constant name="tachOutputPinMode">"default"</constant>
+        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
+        <constant digits="0" name="manIdlePosition" units="%">50.0</constant>
         <constant digits="0" name="multisparkMaxSparkingAngle" units="deg">30.0</constant>
         <constant digits="0" name="multisparkMaxExtraSparkCount" units="count">2.0</constant>
+        <constant digits="0" name="vvtControlMinRpm" units="RPM">2000.0</constant>
         <constant digits="2" name="injector_flow" units="cm3/min">320.0</constant>
         <constant cols="1" digits="2" name="injector_battLagCorrBins" rows="8">
          6.0
@@ -182,6 +181,7 @@
         <constant digits="0" name="triggerSimulatorRpm" units="RPM">1200.0</constant>
         <constant digits="0" name="cylindersCount" units="">3.0</constant>
         <constant name="firingOrder">"1-2-3"</constant>
+        <constant digits="0" name="justATempTest" units="">0.0</constant>
         <constant name="communityCommsLedPid">"NONE"</constant>
         <constant digits="2" name="cylinderBore" units="mm">87.5</constant>
         <constant name="fuelAlgorithm">"Speed Density"</constant>
@@ -195,8 +195,10 @@
         <constant name="ignitionMode">"Individual Coils"</constant>
         <constant digits="0" name="gapTrackingLengthOverride" units="count">0.0</constant>
         <constant digits="0" name="maxIdleVss" units="kph">0.0</constant>
+        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
         <constant digits="0" name="minOilPressureAfterStart" units="kPa">0.0</constant>
         <constant name="timingMode">"dynamic"</constant>
+        <constant name="canNbcType">"None"</constant>
         <constant digits="0" name="fixedModeTiming" units="RPM">50.0</constant>
         <constant digits="0" name="globalTriggerAngleOffset" units="deg btdc">0.0</constant>
         <constant digits="2" name="analogInputDividerCoefficient" units="coef">2.0</constant>
@@ -205,12 +207,7 @@
         <constant digits="0" name="fanOffTemperature" units="deg C">82.0</constant>
         <constant name="acrPin">"NONE"</constant>
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">1000.0</constant>
-        <constant name="canNbcType">"None"</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
-        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
-        <constant digits="0" name="justATempTest" units="">0.0</constant>
-        <constant digits="0" name="unusedHere333" units="">0.0</constant>
-        <constant digits="0" name="unusedHere334" units="">0.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
         <constant name="tps1_1AdcChannel">"Disabled"</constant>
         <constant name="vbattAdcChannel">"Disabled"</constant>
@@ -226,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.0240319E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240322E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"PE15"</constant>
@@ -254,12 +251,12 @@
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
         <constant name="idle_stepperStepPin">"NONE"</constant>
         <constant name="idle_solenoidPinMode">"default"</constant>
-        <constant digits="0" name="manIdlePosition" units="%">50.0</constant>
         <constant digits="1" name="knockRetardAggression" units="%">20.0</constant>
         <constant digits="1" name="knockRetardReapplyRate" units="deg/s">3.0</constant>
         <constant name="engineSyncCam">"Intake First Bank"</constant>
-        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
+        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="3" name="vssGearRatio" units="ratio">3.73</constant>
+        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
         <constant digits="0" name="vssToothCount" units="count">10.0</constant>
         <constant name="idleVeOverrideMode">"None"</constant>
         <constant name="l9779_cs">"NONE"</constant>
@@ -308,22 +305,13 @@
         <constant name="max31855spiDevice">"Off"</constant>
         <constant name="debugTriggerSync">"NONE"</constant>
         <constant name="digitalPotentiometerSpiDevice">"Off"</constant>
+        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
         <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
         <constant name="tps1_2AdcChannel">"Disabled"</constant>
         <constant name="tps2_2AdcChannel">"Disabled"</constant>
         <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
-        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -331,23 +319,10 @@
         <constant name="triggerInputPins2">"NONE"</constant>
         <constant digits="0" name="mc33_t_min_boost" units="us">100.0</constant>
         <constant name="hip9011CsPinMode">"default"</constant>
-        <constant name="tachOutputPin">"NONE"</constant>
-        <constant name="tachOutputPinMode">"default"</constant>
-        <constant name="mainRelayPin">"NONE"</constant>
-        <constant name="sdCardCsPin">"NONE"</constant>
-        <constant name="canTxPin">"NONE"</constant>
-        <constant name="canRxPin">"NONE"</constant>
         <constant name="throttlePedalUpPinMode">"DEFAULT"</constant>
-        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
         <constant digits="2" name="finalGearRatio" units="ratio">1.0</constant>
         <constant name="tcuInputSpeedSensorPin">"NONE"</constant>
         <constant digits="0" name="tcuInputSpeedSensorTeeth" units="">1.0</constant>
-        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
-        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
         <constant name="triggerSimulatorPins1">"NONE"</constant>
         <constant name="triggerSimulatorPins2">"NONE"</constant>
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
@@ -403,27 +378,7 @@
         <constant name="acFanPin">"NONE"</constant>
         <constant name="acFanPinMode">"default"</constant>
         <constant name="l9779spiDevice">"Off"</constant>
-        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         14.0
-         15.0
-</constant>
         <constant name="imuType">"None"</constant>
-        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
-         1.26
-         1.2
-         1.16
-         1.1
-         1.06
-         1.0
-         0.9
-         0.8
-</constant>
         <constant digits="0" name="vehicleWeight" units="kg">0.0</constant>
         <constant digits="0" name="idlePidRpmUpperLimit" units="RPM">300.0</constant>
         <constant digits="3" name="applyNonlinearBelowPulse" units="ms">0.0</constant>
@@ -454,6 +409,8 @@
         <constant name="starterRelayDisablePinMode">"default"</constant>
         <constant name="secondSolenoidPin">"NONE"</constant>
         <constant name="startStopButtonPin">"PA1"</constant>
+        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
+        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="0" name="mapMinBufferLength" units="count">1.0</constant>
         <constant digits="0" name="idlePidDeactivationTpsThreshold" units="%">2.0</constant>
         <constant digits="0" name="stepperParkingExtraSteps" units="%">0.0</constant>
@@ -466,8 +423,6 @@
         <constant name="acRelayPin">"NONE"</constant>
         <constant digits="0" name="lambdaProtectionMinTps" units="%">50.0</constant>
         <constant digits="1" name="lambdaProtectionTimeout" units="s">0.5</constant>
-        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
-        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="2" name="scriptSetting1" units="">0.0</constant>
         <constant digits="2" name="scriptSetting2" units="">0.0</constant>
         <constant digits="2" name="scriptSetting3" units="">0.0</constant>
@@ -546,6 +501,8 @@
         <constant digits="0" name="boostPwmFrequency" units="Hz">33.0</constant>
         <constant name="launchActivationMode">"Launch Button"</constant>
         <constant name="antiLagActivationMode">"Switch Input"</constant>
+        <constant digits="2" name="tpsAccelLookback" units="sec">0.3</constant>
+        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="0" name="launchSpeedThreshold" units="Kph">30.0</constant>
         <constant digits="0" name="launchRpmWindow" units="RPM">500.0</constant>
         <constant digits="0" name="launchSparkSkipPercent" units="%">0.0</constant>
@@ -596,16 +553,6 @@
         <constant name="drv8860_cs">"NONE"</constant>
         <constant name="drv8860_csPinMode">"default"</constant>
         <constant name="drv8860_miso">"NONE"</constant>
-        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
-         0.0
-         0.71
-         1.43
-         2.14
-         2.86
-         3.57
-         4.29
-         5.0
-</constant>
         <constant name="luaOutputPins1">"NONE"</constant>
         <constant name="luaOutputPins2">"NONE"</constant>
         <constant name="luaOutputPins3">"NONE"</constant>
@@ -811,10 +758,8 @@
         <constant name="auxSerialTxPin">"NONE"</constant>
         <constant name="auxSerialRxPin">"NONE"</constant>
         <constant name="accelerometerCsPin">"NONE"</constant>
-        <constant digits="2" name="tpsAccelLookback" units="sec">0.3</constant>
         <constant digits="0" name="coastingFuelCutVssLow" units="kph">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssHigh" units="kph">0.0</constant>
-        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="1" name="tpsAccelEnrichmentThreshold" units="roc">12.0</constant>
         <constant name="auxSpeedSensorInputPin1">"NONE"</constant>
         <constant name="auxSpeedSensorInputPin2">"NONE"</constant>
@@ -903,7 +848,6 @@
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
-        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="0" name="crankingIACposition" units="percent">50.0</constant>
         <constant digits="4" name="tChargeMinRpmMinTps" units="">0.25</constant>
         <constant digits="4" name="tChargeMinRpmMaxTps" units="">0.25</constant>
@@ -1021,7 +965,6 @@
         <constant name="mc33816_rstb">"NONE"</constant>
         <constant name="mc33816_driven">"NONE"</constant>
         <constant name="brakePedalPin">"NONE"</constant>
-        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant digits="4" name="auxPid1_pFactor" units="">2.0</constant>
         <constant digits="4" name="auxPid1_iFactor" units="">0.005</constant>
         <constant digits="4" name="auxPid1_dFactor" units="">0.0</constant>
@@ -1068,12 +1011,7 @@
         <constant name="tle8888_csPinMode">"default"</constant>
         <constant name="mc33816_cs">"NONE"</constant>
         <constant digits="1" name="auxFrequencyFilter" units="hz">0.0</constant>
-        <constant digits="0" name="vvtControlMinRpm" units="RPM">2000.0</constant>
         <constant name="sentInputPins1">"NONE"</constant>
-        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
-        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
-        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
-        <constant digits="0" name="unused645646" units="">0.0</constant>
         <constant digits="0" name="coastingFuelCutRpmHigh" units="rpm">1500.0</constant>
         <constant digits="0" name="coastingFuelCutRpmLow" units="rpm">1300.0</constant>
         <constant digits="0" name="coastingFuelCutTps" units="%">2.0</constant>
@@ -1090,24 +1028,11 @@
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value2" units="">0.0</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
-         -20.0
-         0.0
-         40.0
-         80.0
-</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant digits="3" name="tChargeAirCoefMin" units="">0.098</constant>
         <constant digits="3" name="tChargeAirCoefMax" units="">0.902</constant>
         <constant digits="1" name="tChargeAirFlowMax" units="kg/h">153.6</constant>
         <constant digits="1" name="tChargeAirIncrLimit" units="deg/sec">1.0</constant>
         <constant digits="1" name="tChargeAirDecrLimit" units="deg/sec">12.5</constant>
-        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="2" name="hip9011Gain" units="">1.0</constant>
         <constant digits="0" name="etb_iTermMin" units="">-30.0</constant>
         <constant digits="0" name="etb_iTermMax" units="">30.0</constant>
@@ -1129,10 +1054,10 @@
         <constant digits="1" name="stoichRatioPrimary" units=":1">14.7</constant>
         <constant digits="0" name="idlerpmpid_iTermMax" units="">20.0</constant>
         <constant digits="0" name="etbIdleThrottleRange" units="%">10.0</constant>
-        <constant digits="0" name="cylinderBankSelect1" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect2" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect3" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect4" units="">0.0</constant>
+        <constant digits="0" name="cylinderBankSelect1" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect2" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect3" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect4" units="">1.0</constant>
         <constant digits="0" name="cylinderBankSelect5" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect6" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect7" units="">0.0</constant>
@@ -1340,24 +1265,6 @@
         <constant name="tcu_solenoid_mode4">"default"</constant>
         <constant name="tcu_solenoid_mode5">"default"</constant>
         <constant name="tcu_solenoid_mode6">"default"</constant>
-        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-</constant>
         <constant digits="3" name="triggerGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom2" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom3" units="ratio">0.0</constant>
@@ -1397,13 +1304,8 @@
         <constant digits="0" name="maxCamPhaseResolveRpm" units="rpm">0.0</constant>
         <constant digits="1" name="dfcoDelay" units="sec">0.0</constant>
         <constant digits="1" name="acDelay" units="sec">0.5</constant>
+        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="3" name="fordInjectorSmallPulseBreakPoint" units="mg">0.0</constant>
-        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="etbJamIntegratorLimit" units="%">0.0</constant>
         <constant digits="0" name="hpfpCamLobes" units="lobes/cam">3.0</constant>
         <constant name="hpfpCam">"NONE"</constant>
@@ -1415,134 +1317,6 @@
         <constant digits="3" name="hpfpPidP" units="%/kPa">0.01</constant>
         <constant digits="5" name="hpfpPidI" units="%/kPa/lobe">3.0E-4</constant>
         <constant digits="0" name="hpfpTargetDecay" units="kPa/s">2000.0</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
-         0.0
-         1.0
-         4.5
-         9.5
-         16.5
-         25.0
-         34.5
-         45.0
-         55.0
-         65.5
-         75.0
-         83.5
-         90.5
-         95.5
-         99.0
-         100.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
-         0.0
-         7.5
-         16.5
-         24.0
-         32.0
-         40.0
-         48.0
-         56.0
-         64.0
-         72.0
-         80.0
-         88.0
-         96.0
-         103.5
-         112.5
-         120.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         15.0
-         16.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-         120.0
-         140.0
-         160.0
-         180.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
-         0.005
-         0.018
-         0.031
-         0.043
-         0.056
-         0.069
-         0.082
-         0.094
-         0.107
-         0.12
-</constant>
-        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
         <constant name="stepper_raw_output1">"NONE"</constant>
         <constant name="stepper_raw_output2">"NONE"</constant>
         <constant name="stepper_raw_output3">"NONE"</constant>
@@ -1558,66 +1332,6 @@
         <constant digits="2" name="gearRatio9" units="ratio">0.0</constant>
         <constant digits="2" name="gearRatio10" units="ratio">0.0</constant>
         <constant digits="0" name="vvtActivationDelayMs" units="ms">6000.0</constant>
-        <constant cols="1" digits="0" name="wwCltBins" rows="8">
-         -40.0
-         -20.0
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
-         1.45
-         1.3
-         1.17
-         1.05
-         0.9
-         0.82
-         0.75
-         0.7
-</constant>
-        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
-         0.73
-         0.66
-         0.57
-         0.46
-         0.38
-         0.31
-         0.24
-         0.19
-</constant>
-        <constant cols="1" digits="0" name="wwMapBins" rows="8">
-         10.0
-         20.0
-         30.0
-         40.0
-         50.0
-         60.0
-         70.0
-         80.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
-         0.38
-         0.55
-         0.69
-         0.86
-         0.9
-         0.95
-         0.97
-         1.0
-</constant>
-        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
-         0.21
-         0.4
-         0.6
-         0.79
-         0.85
-         0.9
-         0.95
-         1.0
-</constant>
         <constant cols="6" digits="0" name="torqueTable" rows="6">
          0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0
@@ -1703,7 +1417,6 @@
          0.0
          0.0
 </constant>
-        <constant digits="0" name="unused3124141" units="">0.0</constant>
         <constant name="fuelPressureSensorMode">"Absolute"</constant>
         <constant name="luaDigitalInputPins1">"NONE"</constant>
         <constant name="luaDigitalInputPins2">"NONE"</constant>
@@ -1713,12 +1426,6 @@
         <constant name="luaDigitalInputPins6">"NONE"</constant>
         <constant name="luaDigitalInputPins7">"NONE"</constant>
         <constant name="luaDigitalInputPins8">"NONE"</constant>
-        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
-         650.0
-         800.0
-         3750.0
-         7000.0
-</constant>
         <constant digits="0" name="ALSMinRPM" units="rpm">400.0</constant>
         <constant digits="0" name="ALSMaxRPM" units="rpm">3200.0</constant>
         <constant digits="0" name="ALSMaxDuration" units="sec">3.0</constant>
@@ -1894,7 +1601,124 @@
         <constant name="spi5MisoMode">"default"</constant>
         <constant name="spi6SckMode">"default"</constant>
         <constant name="spi6MosiMode">"default"</constant>
-        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="120">
+        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
+        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="236">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
          0.0
          0.0
          0.0
@@ -2380,40 +2204,22 @@
          0.0
          0.0
 </constant>
-        <constant cols="1" digits="0" name="unusedGapInCalibration" rows="32">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
+        <constant digits="0" name="fancyOptions1" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions2" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions3" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions4" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions5" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions6" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions7" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions8" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions9" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions10" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions11" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions12" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions13" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions14" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions15" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions16" units="">0.0</constant>
         <constant cols="8" digits="1" name="boostTableOpenLoop" rows="8">
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
@@ -4551,9 +4357,297 @@ end</constant>
          3600.0
          5000.0
          7000.0
+</constant>
+        <constant cols="1" digits="0" name="wwCltBins" rows="8">
+         -40.0
+         -20.0
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
+         1.45
+         1.3
+         1.17
+         1.05
+         0.9
+         0.82
+         0.75
+         0.7
+</constant>
+        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
+         0.73
+         0.66
+         0.57
+         0.46
+         0.38
+         0.31
+         0.24
+         0.19
+</constant>
+        <constant cols="1" digits="0" name="wwMapBins" rows="8">
+         10.0
+         20.0
+         30.0
+         40.0
+         50.0
+         60.0
+         70.0
+         80.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
+         0.38
+         0.55
+         0.69
+         0.86
+         0.9
+         0.95
+         0.97
+         1.0
+</constant>
+        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
+         0.21
+         0.4
+         0.6
+         0.79
+         0.85
+         0.9
+         0.95
+         1.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
+         0.0
+         1.0
+         4.5
+         9.5
+         16.5
+         25.0
+         34.5
+         45.0
+         55.0
+         65.5
+         75.0
+         83.5
+         90.5
+         95.5
+         99.0
+         100.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
+         0.0
+         7.5
+         16.5
+         24.0
+         32.0
+         40.0
+         48.0
+         56.0
+         64.0
+         72.0
+         80.0
+         88.0
+         96.0
+         103.5
+         112.5
+         120.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         15.0
+         16.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+         120.0
+         140.0
+         160.0
+         180.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
+         0.005
+         0.018
+         0.031
+         0.043
+         0.056
+         0.069
+         0.082
+         0.094
+         0.107
+         0.12
+</constant>
+        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
+         650.0
+         800.0
+         1100.0
+         1400.0
+         1700.0
+         2000.0
+         2300.0
+         2600.0
+         2900.0
+         3200.0
+         3500.0
+         3800.0
+         4100.0
+         4400.0
+         4700.0
+         7000.0
+</constant>
+        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+</constant>
+        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
+         650.0
+         800.0
+         3750.0
+         7000.0
+</constant>
+        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
+         1.0
+         1.0
+         1.0
+         1.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
+         -20.0
+         0.0
+         40.0
+         80.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
+         0.0
+         0.71
+         1.43
+         2.14
+         2.86
+         3.57
+         4.29
+         5.0
+</constant>
+        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         14.0
+         15.0
+</constant>
+        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
+         1.26
+         1.2
+         1.16
+         1.1
+         1.06
+         1.0
+         0.9
+         0.8
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.19.XXX.4275859823" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.22.XXX.4019883890" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_MAZDA_MIATA_NA6.msq b/generated/simulator_tune_MAZDA_MIATA_NA6.msq
index aba4ea9..8b148a7 100644
--- a/generated/simulator_tune_MAZDA_MIATA_NA6.msq
+++ b/generated/simulator_tune_MAZDA_MIATA_NA6.msq
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <msq xmlns="http://www.msefi.com/:msq">
     <page/>
-    <page number="0" size="22428">
+    <page number="0" size="22400">
         <constant name="engineType">"MAZDA_MIATA_NA6"</constant>
         <constant digits="0" name="startButtonSuppressOnStartUpMs" units="">0.0</constant>
         <constant digits="0" name="sensorSnifferRpmThreshold" units="RPM">2500.0</constant>
@@ -12,26 +12,25 @@
         <constant digits="0" name="maxAcRpm" units="rpm">5000.0</constant>
         <constant digits="0" name="maxAcTps" units="%">75.0</constant>
         <constant digits="0" name="maxAcClt" units="deg C">100.0</constant>
-        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
-         650.0
-         800.0
-         1100.0
-         1400.0
-         1700.0
-         2000.0
-         2300.0
-         2600.0
-         2900.0
-         3200.0
-         3500.0
-         3800.0
-         4100.0
-         4400.0
-         4700.0
-         7000.0
-</constant>
+        <constant digits="1" name="compressionRatio" units="CR">9.1</constant>
+        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
+        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
+        <constant name="mainRelayPin">"NONE"</constant>
+        <constant name="sdCardCsPin">"NONE"</constant>
+        <constant name="canTxPin">"NONE"</constant>
+        <constant name="canRxPin">"NONE"</constant>
+        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
+        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
+        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
+        <constant name="tachOutputPin">"NONE"</constant>
+        <constant name="tachOutputPinMode">"default"</constant>
+        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
+        <constant digits="0" name="manIdlePosition" units="%">20.0</constant>
         <constant digits="0" name="multisparkMaxSparkingAngle" units="deg">30.0</constant>
         <constant digits="0" name="multisparkMaxExtraSparkCount" units="count">2.0</constant>
+        <constant digits="0" name="vvtControlMinRpm" units="RPM">500.0</constant>
         <constant digits="2" name="injector_flow" units="cm3/min">212.0</constant>
         <constant cols="1" digits="2" name="injector_battLagCorrBins" rows="8">
          6.0
@@ -182,6 +181,7 @@
         <constant digits="0" name="triggerSimulatorRpm" units="RPM">1200.0</constant>
         <constant digits="0" name="cylindersCount" units="">4.0</constant>
         <constant name="firingOrder">"1-3-4-2"</constant>
+        <constant digits="0" name="justATempTest" units="">0.0</constant>
         <constant name="communityCommsLedPid">"NONE"</constant>
         <constant digits="2" name="cylinderBore" units="mm">78.0</constant>
         <constant name="fuelAlgorithm">"Speed Density"</constant>
@@ -195,8 +195,10 @@
         <constant name="ignitionMode">"Wasted Spark"</constant>
         <constant digits="0" name="gapTrackingLengthOverride" units="count">0.0</constant>
         <constant digits="0" name="maxIdleVss" units="kph">0.0</constant>
+        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
         <constant digits="0" name="minOilPressureAfterStart" units="kPa">0.0</constant>
         <constant name="timingMode">"dynamic"</constant>
+        <constant name="canNbcType">"None"</constant>
         <constant digits="0" name="fixedModeTiming" units="RPM">50.0</constant>
         <constant digits="0" name="globalTriggerAngleOffset" units="deg btdc">0.0</constant>
         <constant digits="2" name="analogInputDividerCoefficient" units="coef">2.0</constant>
@@ -205,12 +207,7 @@
         <constant digits="0" name="fanOffTemperature" units="deg C">88.0</constant>
         <constant name="acrPin">"NONE"</constant>
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">551.0</constant>
-        <constant name="canNbcType">"None"</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
-        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
-        <constant digits="0" name="justATempTest" units="">0.0</constant>
-        <constant digits="0" name="unusedHere333" units="">0.0</constant>
-        <constant digits="0" name="unusedHere334" units="">0.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
         <constant name="tps1_1AdcChannel">"Disabled"</constant>
         <constant name="vbattAdcChannel">"Disabled"</constant>
@@ -226,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.0240319E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240322E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -254,12 +251,12 @@
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
         <constant name="idle_stepperStepPin">"NONE"</constant>
         <constant name="idle_solenoidPinMode">"default"</constant>
-        <constant digits="0" name="manIdlePosition" units="%">20.0</constant>
         <constant digits="1" name="knockRetardAggression" units="%">20.0</constant>
         <constant digits="1" name="knockRetardReapplyRate" units="deg/s">3.0</constant>
         <constant name="engineSyncCam">"Intake First Bank"</constant>
-        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
+        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="3" name="vssGearRatio" units="ratio">1.122</constant>
+        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
         <constant digits="0" name="vssToothCount" units="count">4.0</constant>
         <constant name="idleVeOverrideMode">"None"</constant>
         <constant name="l9779_cs">"NONE"</constant>
@@ -308,22 +305,13 @@
         <constant name="max31855spiDevice">"Off"</constant>
         <constant name="debugTriggerSync">"NONE"</constant>
         <constant name="digitalPotentiometerSpiDevice">"Off"</constant>
+        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
         <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
         <constant name="tps1_2AdcChannel">"Disabled"</constant>
         <constant name="tps2_2AdcChannel">"Disabled"</constant>
         <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
-        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -331,23 +319,10 @@
         <constant name="triggerInputPins2">"NONE"</constant>
         <constant digits="0" name="mc33_t_min_boost" units="us">100.0</constant>
         <constant name="hip9011CsPinMode">"default"</constant>
-        <constant name="tachOutputPin">"NONE"</constant>
-        <constant name="tachOutputPinMode">"default"</constant>
-        <constant name="mainRelayPin">"NONE"</constant>
-        <constant name="sdCardCsPin">"NONE"</constant>
-        <constant name="canTxPin">"NONE"</constant>
-        <constant name="canRxPin">"NONE"</constant>
         <constant name="throttlePedalUpPinMode">"DEFAULT"</constant>
-        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
         <constant digits="2" name="finalGearRatio" units="ratio">4.3</constant>
         <constant name="tcuInputSpeedSensorPin">"NONE"</constant>
         <constant digits="0" name="tcuInputSpeedSensorTeeth" units="">1.0</constant>
-        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
-        <constant digits="1" name="compressionRatio" units="CR">9.1</constant>
         <constant name="triggerSimulatorPins1">"NONE"</constant>
         <constant name="triggerSimulatorPins2">"NONE"</constant>
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
@@ -403,27 +378,7 @@
         <constant name="acFanPin">"NONE"</constant>
         <constant name="acFanPinMode">"default"</constant>
         <constant name="l9779spiDevice">"Off"</constant>
-        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         14.0
-         15.0
-</constant>
         <constant name="imuType">"None"</constant>
-        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="vehicleWeight" units="kg">950.0</constant>
         <constant digits="0" name="idlePidRpmUpperLimit" units="RPM">300.0</constant>
         <constant digits="3" name="applyNonlinearBelowPulse" units="ms">0.0</constant>
@@ -454,6 +409,8 @@
         <constant name="starterRelayDisablePinMode">"default"</constant>
         <constant name="secondSolenoidPin">"NONE"</constant>
         <constant name="startStopButtonPin">"NONE"</constant>
+        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
+        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="0" name="mapMinBufferLength" units="count">1.0</constant>
         <constant digits="0" name="idlePidDeactivationTpsThreshold" units="%">5.0</constant>
         <constant digits="0" name="stepperParkingExtraSteps" units="%">0.0</constant>
@@ -466,8 +423,6 @@
         <constant name="acRelayPin">"NONE"</constant>
         <constant digits="0" name="lambdaProtectionMinTps" units="%">50.0</constant>
         <constant digits="1" name="lambdaProtectionTimeout" units="s">0.5</constant>
-        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
-        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="2" name="scriptSetting1" units="">0.0</constant>
         <constant digits="2" name="scriptSetting2" units="">0.0</constant>
         <constant digits="2" name="scriptSetting3" units="">0.0</constant>
@@ -546,6 +501,8 @@
         <constant digits="0" name="boostPwmFrequency" units="Hz">33.0</constant>
         <constant name="launchActivationMode">"Launch Button"</constant>
         <constant name="antiLagActivationMode">"Switch Input"</constant>
+        <constant digits="2" name="tpsAccelLookback" units="sec">0.0</constant>
+        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="0" name="launchSpeedThreshold" units="Kph">30.0</constant>
         <constant digits="0" name="launchRpmWindow" units="RPM">500.0</constant>
         <constant digits="0" name="launchSparkSkipPercent" units="%">0.0</constant>
@@ -596,16 +553,6 @@
         <constant name="drv8860_cs">"NONE"</constant>
         <constant name="drv8860_csPinMode">"default"</constant>
         <constant name="drv8860_miso">"NONE"</constant>
-        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
-         0.0
-         0.71
-         1.43
-         2.14
-         2.86
-         3.57
-         4.29
-         5.0
-</constant>
         <constant name="luaOutputPins1">"NONE"</constant>
         <constant name="luaOutputPins2">"NONE"</constant>
         <constant name="luaOutputPins3">"NONE"</constant>
@@ -811,10 +758,8 @@
         <constant name="auxSerialTxPin">"NONE"</constant>
         <constant name="auxSerialRxPin">"NONE"</constant>
         <constant name="accelerometerCsPin">"NONE"</constant>
-        <constant digits="2" name="tpsAccelLookback" units="sec">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssLow" units="kph">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssHigh" units="kph">0.0</constant>
-        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="1" name="tpsAccelEnrichmentThreshold" units="roc">40.0</constant>
         <constant name="auxSpeedSensorInputPin1">"NONE"</constant>
         <constant name="auxSpeedSensorInputPin2">"NONE"</constant>
@@ -903,7 +848,6 @@
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
-        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="0" name="crankingIACposition" units="percent">50.0</constant>
         <constant digits="4" name="tChargeMinRpmMinTps" units="">0.25</constant>
         <constant digits="4" name="tChargeMinRpmMaxTps" units="">0.25</constant>
@@ -1021,7 +965,6 @@
         <constant name="mc33816_rstb">"NONE"</constant>
         <constant name="mc33816_driven">"NONE"</constant>
         <constant name="brakePedalPin">"NONE"</constant>
-        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant digits="4" name="auxPid1_pFactor" units="">2.0</constant>
         <constant digits="4" name="auxPid1_iFactor" units="">0.005</constant>
         <constant digits="4" name="auxPid1_dFactor" units="">0.0</constant>
@@ -1068,12 +1011,7 @@
         <constant name="tle8888_csPinMode">"default"</constant>
         <constant name="mc33816_cs">"NONE"</constant>
         <constant digits="1" name="auxFrequencyFilter" units="hz">0.0</constant>
-        <constant digits="0" name="vvtControlMinRpm" units="RPM">500.0</constant>
         <constant name="sentInputPins1">"NONE"</constant>
-        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
-        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
-        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
-        <constant digits="0" name="unused645646" units="">0.0</constant>
         <constant digits="0" name="coastingFuelCutRpmHigh" units="rpm">1500.0</constant>
         <constant digits="0" name="coastingFuelCutRpmLow" units="rpm">1300.0</constant>
         <constant digits="0" name="coastingFuelCutTps" units="%">2.0</constant>
@@ -1090,24 +1028,11 @@
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value2" units="">0.0</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
-         -20.0
-         0.0
-         40.0
-         80.0
-</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant digits="3" name="tChargeAirCoefMin" units="">0.098</constant>
         <constant digits="3" name="tChargeAirCoefMax" units="">0.902</constant>
         <constant digits="1" name="tChargeAirFlowMax" units="kg/h">153.6</constant>
         <constant digits="1" name="tChargeAirIncrLimit" units="deg/sec">1.0</constant>
         <constant digits="1" name="tChargeAirDecrLimit" units="deg/sec">12.5</constant>
-        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="2" name="hip9011Gain" units="">1.0</constant>
         <constant digits="0" name="etb_iTermMin" units="">-30.0</constant>
         <constant digits="0" name="etb_iTermMax" units="">30.0</constant>
@@ -1129,10 +1054,10 @@
         <constant digits="1" name="stoichRatioPrimary" units=":1">14.7</constant>
         <constant digits="0" name="idlerpmpid_iTermMax" units="">20.0</constant>
         <constant digits="0" name="etbIdleThrottleRange" units="%">15.0</constant>
-        <constant digits="0" name="cylinderBankSelect1" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect2" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect3" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect4" units="">0.0</constant>
+        <constant digits="0" name="cylinderBankSelect1" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect2" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect3" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect4" units="">1.0</constant>
         <constant digits="0" name="cylinderBankSelect5" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect6" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect7" units="">0.0</constant>
@@ -1340,24 +1265,6 @@
         <constant name="tcu_solenoid_mode4">"default"</constant>
         <constant name="tcu_solenoid_mode5">"default"</constant>
         <constant name="tcu_solenoid_mode6">"default"</constant>
-        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-</constant>
         <constant digits="3" name="triggerGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom2" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom3" units="ratio">0.0</constant>
@@ -1397,13 +1304,8 @@
         <constant digits="0" name="maxCamPhaseResolveRpm" units="rpm">0.0</constant>
         <constant digits="1" name="dfcoDelay" units="sec">0.0</constant>
         <constant digits="1" name="acDelay" units="sec">0.5</constant>
+        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="3" name="fordInjectorSmallPulseBreakPoint" units="mg">0.0</constant>
-        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="etbJamIntegratorLimit" units="%">0.0</constant>
         <constant digits="0" name="hpfpCamLobes" units="lobes/cam">3.0</constant>
         <constant name="hpfpCam">"NONE"</constant>
@@ -1415,134 +1317,6 @@
         <constant digits="3" name="hpfpPidP" units="%/kPa">0.01</constant>
         <constant digits="5" name="hpfpPidI" units="%/kPa/lobe">3.0E-4</constant>
         <constant digits="0" name="hpfpTargetDecay" units="kPa/s">2000.0</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
-         0.0
-         1.0
-         4.5
-         9.5
-         16.5
-         25.0
-         34.5
-         45.0
-         55.0
-         65.5
-         75.0
-         83.5
-         90.5
-         95.5
-         99.0
-         100.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
-         0.0
-         7.5
-         16.5
-         24.0
-         32.0
-         40.0
-         48.0
-         56.0
-         64.0
-         72.0
-         80.0
-         88.0
-         96.0
-         103.5
-         112.5
-         120.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         15.0
-         16.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-         120.0
-         140.0
-         160.0
-         180.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
-         0.005
-         0.018
-         0.031
-         0.043
-         0.056
-         0.069
-         0.082
-         0.094
-         0.107
-         0.12
-</constant>
-        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
         <constant name="stepper_raw_output1">"NONE"</constant>
         <constant name="stepper_raw_output2">"NONE"</constant>
         <constant name="stepper_raw_output3">"NONE"</constant>
@@ -1558,66 +1332,6 @@
         <constant digits="2" name="gearRatio9" units="ratio">0.0</constant>
         <constant digits="2" name="gearRatio10" units="ratio">0.0</constant>
         <constant digits="0" name="vvtActivationDelayMs" units="ms">6000.0</constant>
-        <constant cols="1" digits="0" name="wwCltBins" rows="8">
-         -40.0
-         -20.0
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
-         1.45
-         1.3
-         1.17
-         1.05
-         0.9
-         0.82
-         0.75
-         0.7
-</constant>
-        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
-         0.73
-         0.66
-         0.57
-         0.46
-         0.38
-         0.31
-         0.24
-         0.19
-</constant>
-        <constant cols="1" digits="0" name="wwMapBins" rows="8">
-         10.0
-         20.0
-         30.0
-         40.0
-         50.0
-         60.0
-         70.0
-         80.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
-         0.38
-         0.55
-         0.69
-         0.86
-         0.9
-         0.95
-         0.97
-         1.0
-</constant>
-        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
-         0.21
-         0.4
-         0.6
-         0.79
-         0.85
-         0.9
-         0.95
-         1.0
-</constant>
         <constant cols="6" digits="0" name="torqueTable" rows="6">
          0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0
@@ -1703,7 +1417,6 @@
          0.0
          0.0
 </constant>
-        <constant digits="0" name="unused3124141" units="">0.0</constant>
         <constant name="fuelPressureSensorMode">"Absolute"</constant>
         <constant name="luaDigitalInputPins1">"NONE"</constant>
         <constant name="luaDigitalInputPins2">"NONE"</constant>
@@ -1713,12 +1426,6 @@
         <constant name="luaDigitalInputPins6">"NONE"</constant>
         <constant name="luaDigitalInputPins7">"NONE"</constant>
         <constant name="luaDigitalInputPins8">"NONE"</constant>
-        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
-         650.0
-         800.0
-         3750.0
-         7000.0
-</constant>
         <constant digits="0" name="ALSMinRPM" units="rpm">400.0</constant>
         <constant digits="0" name="ALSMaxRPM" units="rpm">3200.0</constant>
         <constant digits="0" name="ALSMaxDuration" units="sec">3.0</constant>
@@ -1894,7 +1601,124 @@
         <constant name="spi5MisoMode">"default"</constant>
         <constant name="spi6SckMode">"default"</constant>
         <constant name="spi6MosiMode">"default"</constant>
-        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="120">
+        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
+        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="236">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
          0.0
          0.0
          0.0
@@ -2380,40 +2204,22 @@
          40.0
          40.0
 </constant>
-        <constant cols="1" digits="0" name="unusedGapInCalibration" rows="32">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
+        <constant digits="0" name="fancyOptions1" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions2" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions3" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions4" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions5" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions6" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions7" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions8" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions9" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions10" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions11" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions12" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions13" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions14" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions15" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions16" units="">0.0</constant>
         <constant cols="8" digits="1" name="boostTableOpenLoop" rows="8">
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
@@ -4554,9 +4360,297 @@ end</constant>
          3600.0
          5000.0
          7000.0
+</constant>
+        <constant cols="1" digits="0" name="wwCltBins" rows="8">
+         -40.0
+         -20.0
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
+         1.45
+         1.3
+         1.17
+         1.05
+         0.9
+         0.82
+         0.75
+         0.7
+</constant>
+        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
+         0.73
+         0.66
+         0.57
+         0.46
+         0.38
+         0.31
+         0.24
+         0.19
+</constant>
+        <constant cols="1" digits="0" name="wwMapBins" rows="8">
+         10.0
+         20.0
+         30.0
+         40.0
+         50.0
+         60.0
+         70.0
+         80.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
+         0.38
+         0.55
+         0.69
+         0.86
+         0.9
+         0.95
+         0.97
+         1.0
+</constant>
+        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
+         0.21
+         0.4
+         0.6
+         0.79
+         0.85
+         0.9
+         0.95
+         1.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
+         0.0
+         1.0
+         4.5
+         9.5
+         16.5
+         25.0
+         34.5
+         45.0
+         55.0
+         65.5
+         75.0
+         83.5
+         90.5
+         95.5
+         99.0
+         100.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
+         0.0
+         7.5
+         16.5
+         24.0
+         32.0
+         40.0
+         48.0
+         56.0
+         64.0
+         72.0
+         80.0
+         88.0
+         96.0
+         103.5
+         112.5
+         120.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         15.0
+         16.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+         120.0
+         140.0
+         160.0
+         180.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
+         0.005
+         0.018
+         0.031
+         0.043
+         0.056
+         0.069
+         0.082
+         0.094
+         0.107
+         0.12
+</constant>
+        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
+         650.0
+         800.0
+         1100.0
+         1400.0
+         1700.0
+         2000.0
+         2300.0
+         2600.0
+         2900.0
+         3200.0
+         3500.0
+         3800.0
+         4100.0
+         4400.0
+         4700.0
+         7000.0
+</constant>
+        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+</constant>
+        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
+         650.0
+         800.0
+         3750.0
+         7000.0
+</constant>
+        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
+         1.0
+         1.0
+         1.0
+         1.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
+         -20.0
+         0.0
+         40.0
+         80.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
+         0.0
+         0.71
+         1.43
+         2.14
+         2.86
+         3.57
+         4.29
+         5.0
+</constant>
+        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         14.0
+         15.0
+</constant>
+        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.19.XXX.4275859823" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.22.XXX.4019883890" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_MAZDA_MIATA_NA94.msq b/generated/simulator_tune_MAZDA_MIATA_NA94.msq
index 4cb4346..301a8d9 100644
--- a/generated/simulator_tune_MAZDA_MIATA_NA94.msq
+++ b/generated/simulator_tune_MAZDA_MIATA_NA94.msq
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <msq xmlns="http://www.msefi.com/:msq">
     <page/>
-    <page number="0" size="22428">
+    <page number="0" size="22400">
         <constant name="engineType">"MAZDA_MIATA_NA94"</constant>
         <constant digits="0" name="startButtonSuppressOnStartUpMs" units="">0.0</constant>
         <constant digits="0" name="sensorSnifferRpmThreshold" units="RPM">2500.0</constant>
@@ -12,26 +12,25 @@
         <constant digits="0" name="maxAcRpm" units="rpm">5000.0</constant>
         <constant digits="0" name="maxAcTps" units="%">75.0</constant>
         <constant digits="0" name="maxAcClt" units="deg C">100.0</constant>
-        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
-         650.0
-         800.0
-         1100.0
-         1400.0
-         1700.0
-         2000.0
-         2300.0
-         2600.0
-         2900.0
-         3200.0
-         3500.0
-         3800.0
-         4100.0
-         4400.0
-         4700.0
-         7000.0
-</constant>
+        <constant digits="1" name="compressionRatio" units="CR">9.1</constant>
+        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
+        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
+        <constant name="mainRelayPin">"NONE"</constant>
+        <constant name="sdCardCsPin">"NONE"</constant>
+        <constant name="canTxPin">"NONE"</constant>
+        <constant name="canRxPin">"NONE"</constant>
+        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
+        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
+        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
+        <constant name="tachOutputPin">"NONE"</constant>
+        <constant name="tachOutputPinMode">"default"</constant>
+        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
+        <constant digits="0" name="manIdlePosition" units="%">20.0</constant>
         <constant digits="0" name="multisparkMaxSparkingAngle" units="deg">30.0</constant>
         <constant digits="0" name="multisparkMaxExtraSparkCount" units="count">2.0</constant>
+        <constant digits="0" name="vvtControlMinRpm" units="RPM">500.0</constant>
         <constant digits="2" name="injector_flow" units="cm3/min">254.0</constant>
         <constant cols="1" digits="2" name="injector_battLagCorrBins" rows="8">
          6.0
@@ -182,6 +181,7 @@
         <constant digits="0" name="triggerSimulatorRpm" units="RPM">1200.0</constant>
         <constant digits="0" name="cylindersCount" units="">4.0</constant>
         <constant name="firingOrder">"1-3-4-2"</constant>
+        <constant digits="0" name="justATempTest" units="">0.0</constant>
         <constant name="communityCommsLedPid">"NONE"</constant>
         <constant digits="2" name="cylinderBore" units="mm">78.0</constant>
         <constant name="fuelAlgorithm">"Speed Density"</constant>
@@ -195,8 +195,10 @@
         <constant name="ignitionMode">"Wasted Spark"</constant>
         <constant digits="0" name="gapTrackingLengthOverride" units="count">0.0</constant>
         <constant digits="0" name="maxIdleVss" units="kph">0.0</constant>
+        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
         <constant digits="0" name="minOilPressureAfterStart" units="kPa">0.0</constant>
         <constant name="timingMode">"dynamic"</constant>
+        <constant name="canNbcType">"None"</constant>
         <constant digits="0" name="fixedModeTiming" units="RPM">50.0</constant>
         <constant digits="0" name="globalTriggerAngleOffset" units="deg btdc">0.0</constant>
         <constant digits="2" name="analogInputDividerCoefficient" units="coef">2.0</constant>
@@ -205,12 +207,7 @@
         <constant digits="0" name="fanOffTemperature" units="deg C">96.0</constant>
         <constant name="acrPin">"NONE"</constant>
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">551.0</constant>
-        <constant name="canNbcType">"None"</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
-        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
-        <constant digits="0" name="justATempTest" units="">0.0</constant>
-        <constant digits="0" name="unusedHere333" units="">0.0</constant>
-        <constant digits="0" name="unusedHere334" units="">0.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
         <constant name="tps1_1AdcChannel">"Disabled"</constant>
         <constant name="vbattAdcChannel">"Disabled"</constant>
@@ -226,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.0240319E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240322E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -254,12 +251,12 @@
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
         <constant name="idle_stepperStepPin">"NONE"</constant>
         <constant name="idle_solenoidPinMode">"default"</constant>
-        <constant digits="0" name="manIdlePosition" units="%">20.0</constant>
         <constant digits="1" name="knockRetardAggression" units="%">20.0</constant>
         <constant digits="1" name="knockRetardReapplyRate" units="deg/s">3.0</constant>
         <constant name="engineSyncCam">"Intake First Bank"</constant>
-        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
+        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="3" name="vssGearRatio" units="ratio">1.122</constant>
+        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
         <constant digits="0" name="vssToothCount" units="count">4.0</constant>
         <constant name="idleVeOverrideMode">"None"</constant>
         <constant name="l9779_cs">"NONE"</constant>
@@ -308,22 +305,13 @@
         <constant name="max31855spiDevice">"Off"</constant>
         <constant name="debugTriggerSync">"NONE"</constant>
         <constant name="digitalPotentiometerSpiDevice">"Off"</constant>
+        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
         <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
         <constant name="tps1_2AdcChannel">"Disabled"</constant>
         <constant name="tps2_2AdcChannel">"Disabled"</constant>
         <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
-        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -331,23 +319,10 @@
         <constant name="triggerInputPins2">"NONE"</constant>
         <constant digits="0" name="mc33_t_min_boost" units="us">100.0</constant>
         <constant name="hip9011CsPinMode">"default"</constant>
-        <constant name="tachOutputPin">"NONE"</constant>
-        <constant name="tachOutputPinMode">"default"</constant>
-        <constant name="mainRelayPin">"NONE"</constant>
-        <constant name="sdCardCsPin">"NONE"</constant>
-        <constant name="canTxPin">"NONE"</constant>
-        <constant name="canRxPin">"NONE"</constant>
         <constant name="throttlePedalUpPinMode">"DEFAULT"</constant>
-        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
         <constant digits="2" name="finalGearRatio" units="ratio">4.3</constant>
         <constant name="tcuInputSpeedSensorPin">"NONE"</constant>
         <constant digits="0" name="tcuInputSpeedSensorTeeth" units="">1.0</constant>
-        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
-        <constant digits="1" name="compressionRatio" units="CR">9.1</constant>
         <constant name="triggerSimulatorPins1">"NONE"</constant>
         <constant name="triggerSimulatorPins2">"NONE"</constant>
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
@@ -403,27 +378,7 @@
         <constant name="acFanPin">"NONE"</constant>
         <constant name="acFanPinMode">"default"</constant>
         <constant name="l9779spiDevice">"Off"</constant>
-        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         14.0
-         15.0
-</constant>
         <constant name="imuType">"None"</constant>
-        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="vehicleWeight" units="kg">950.0</constant>
         <constant digits="0" name="idlePidRpmUpperLimit" units="RPM">300.0</constant>
         <constant digits="3" name="applyNonlinearBelowPulse" units="ms">0.0</constant>
@@ -454,6 +409,8 @@
         <constant name="starterRelayDisablePinMode">"default"</constant>
         <constant name="secondSolenoidPin">"NONE"</constant>
         <constant name="startStopButtonPin">"NONE"</constant>
+        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
+        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="0" name="mapMinBufferLength" units="count">1.0</constant>
         <constant digits="0" name="idlePidDeactivationTpsThreshold" units="%">5.0</constant>
         <constant digits="0" name="stepperParkingExtraSteps" units="%">0.0</constant>
@@ -466,8 +423,6 @@
         <constant name="acRelayPin">"NONE"</constant>
         <constant digits="0" name="lambdaProtectionMinTps" units="%">50.0</constant>
         <constant digits="1" name="lambdaProtectionTimeout" units="s">0.5</constant>
-        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
-        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="2" name="scriptSetting1" units="">0.0</constant>
         <constant digits="2" name="scriptSetting2" units="">0.0</constant>
         <constant digits="2" name="scriptSetting3" units="">0.0</constant>
@@ -546,6 +501,8 @@
         <constant digits="0" name="boostPwmFrequency" units="Hz">33.0</constant>
         <constant name="launchActivationMode">"Launch Button"</constant>
         <constant name="antiLagActivationMode">"Switch Input"</constant>
+        <constant digits="2" name="tpsAccelLookback" units="sec">0.0</constant>
+        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="0" name="launchSpeedThreshold" units="Kph">30.0</constant>
         <constant digits="0" name="launchRpmWindow" units="RPM">500.0</constant>
         <constant digits="0" name="launchSparkSkipPercent" units="%">0.0</constant>
@@ -596,16 +553,6 @@
         <constant name="drv8860_cs">"NONE"</constant>
         <constant name="drv8860_csPinMode">"default"</constant>
         <constant name="drv8860_miso">"NONE"</constant>
-        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
-         0.0
-         0.71
-         1.43
-         2.14
-         2.86
-         3.57
-         4.29
-         5.0
-</constant>
         <constant name="luaOutputPins1">"NONE"</constant>
         <constant name="luaOutputPins2">"NONE"</constant>
         <constant name="luaOutputPins3">"NONE"</constant>
@@ -811,10 +758,8 @@
         <constant name="auxSerialTxPin">"NONE"</constant>
         <constant name="auxSerialRxPin">"NONE"</constant>
         <constant name="accelerometerCsPin">"NONE"</constant>
-        <constant digits="2" name="tpsAccelLookback" units="sec">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssLow" units="kph">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssHigh" units="kph">0.0</constant>
-        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="1" name="tpsAccelEnrichmentThreshold" units="roc">40.0</constant>
         <constant name="auxSpeedSensorInputPin1">"NONE"</constant>
         <constant name="auxSpeedSensorInputPin2">"NONE"</constant>
@@ -903,7 +848,6 @@
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
-        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="0" name="crankingIACposition" units="percent">50.0</constant>
         <constant digits="4" name="tChargeMinRpmMinTps" units="">0.25</constant>
         <constant digits="4" name="tChargeMinRpmMaxTps" units="">0.25</constant>
@@ -1021,7 +965,6 @@
         <constant name="mc33816_rstb">"NONE"</constant>
         <constant name="mc33816_driven">"NONE"</constant>
         <constant name="brakePedalPin">"NONE"</constant>
-        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant digits="4" name="auxPid1_pFactor" units="">2.0</constant>
         <constant digits="4" name="auxPid1_iFactor" units="">0.005</constant>
         <constant digits="4" name="auxPid1_dFactor" units="">0.0</constant>
@@ -1068,12 +1011,7 @@
         <constant name="tle8888_csPinMode">"default"</constant>
         <constant name="mc33816_cs">"NONE"</constant>
         <constant digits="1" name="auxFrequencyFilter" units="hz">0.0</constant>
-        <constant digits="0" name="vvtControlMinRpm" units="RPM">500.0</constant>
         <constant name="sentInputPins1">"NONE"</constant>
-        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
-        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
-        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
-        <constant digits="0" name="unused645646" units="">0.0</constant>
         <constant digits="0" name="coastingFuelCutRpmHigh" units="rpm">1500.0</constant>
         <constant digits="0" name="coastingFuelCutRpmLow" units="rpm">1300.0</constant>
         <constant digits="0" name="coastingFuelCutTps" units="%">2.0</constant>
@@ -1090,24 +1028,11 @@
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value2" units="">0.0</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
-         -20.0
-         0.0
-         40.0
-         80.0
-</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant digits="3" name="tChargeAirCoefMin" units="">0.098</constant>
         <constant digits="3" name="tChargeAirCoefMax" units="">0.902</constant>
         <constant digits="1" name="tChargeAirFlowMax" units="kg/h">153.6</constant>
         <constant digits="1" name="tChargeAirIncrLimit" units="deg/sec">1.0</constant>
         <constant digits="1" name="tChargeAirDecrLimit" units="deg/sec">12.5</constant>
-        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="2" name="hip9011Gain" units="">1.0</constant>
         <constant digits="0" name="etb_iTermMin" units="">-30.0</constant>
         <constant digits="0" name="etb_iTermMax" units="">30.0</constant>
@@ -1129,10 +1054,10 @@
         <constant digits="1" name="stoichRatioPrimary" units=":1">14.7</constant>
         <constant digits="0" name="idlerpmpid_iTermMax" units="">20.0</constant>
         <constant digits="0" name="etbIdleThrottleRange" units="%">15.0</constant>
-        <constant digits="0" name="cylinderBankSelect1" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect2" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect3" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect4" units="">0.0</constant>
+        <constant digits="0" name="cylinderBankSelect1" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect2" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect3" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect4" units="">1.0</constant>
         <constant digits="0" name="cylinderBankSelect5" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect6" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect7" units="">0.0</constant>
@@ -1340,24 +1265,6 @@
         <constant name="tcu_solenoid_mode4">"default"</constant>
         <constant name="tcu_solenoid_mode5">"default"</constant>
         <constant name="tcu_solenoid_mode6">"default"</constant>
-        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-</constant>
         <constant digits="3" name="triggerGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom2" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom3" units="ratio">0.0</constant>
@@ -1397,13 +1304,8 @@
         <constant digits="0" name="maxCamPhaseResolveRpm" units="rpm">0.0</constant>
         <constant digits="1" name="dfcoDelay" units="sec">0.0</constant>
         <constant digits="1" name="acDelay" units="sec">0.5</constant>
+        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="3" name="fordInjectorSmallPulseBreakPoint" units="mg">0.0</constant>
-        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="etbJamIntegratorLimit" units="%">0.0</constant>
         <constant digits="0" name="hpfpCamLobes" units="lobes/cam">3.0</constant>
         <constant name="hpfpCam">"NONE"</constant>
@@ -1415,134 +1317,6 @@
         <constant digits="3" name="hpfpPidP" units="%/kPa">0.01</constant>
         <constant digits="5" name="hpfpPidI" units="%/kPa/lobe">3.0E-4</constant>
         <constant digits="0" name="hpfpTargetDecay" units="kPa/s">2000.0</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
-         0.0
-         1.0
-         4.5
-         9.5
-         16.5
-         25.0
-         34.5
-         45.0
-         55.0
-         65.5
-         75.0
-         83.5
-         90.5
-         95.5
-         99.0
-         100.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
-         0.0
-         7.5
-         16.5
-         24.0
-         32.0
-         40.0
-         48.0
-         56.0
-         64.0
-         72.0
-         80.0
-         88.0
-         96.0
-         103.5
-         112.5
-         120.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         15.0
-         16.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-         120.0
-         140.0
-         160.0
-         180.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
-         0.005
-         0.018
-         0.031
-         0.043
-         0.056
-         0.069
-         0.082
-         0.094
-         0.107
-         0.12
-</constant>
-        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
         <constant name="stepper_raw_output1">"NONE"</constant>
         <constant name="stepper_raw_output2">"NONE"</constant>
         <constant name="stepper_raw_output3">"NONE"</constant>
@@ -1558,66 +1332,6 @@
         <constant digits="2" name="gearRatio9" units="ratio">0.0</constant>
         <constant digits="2" name="gearRatio10" units="ratio">0.0</constant>
         <constant digits="0" name="vvtActivationDelayMs" units="ms">6000.0</constant>
-        <constant cols="1" digits="0" name="wwCltBins" rows="8">
-         -40.0
-         -20.0
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
-         1.45
-         1.3
-         1.17
-         1.05
-         0.9
-         0.82
-         0.75
-         0.7
-</constant>
-        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
-         0.73
-         0.66
-         0.57
-         0.46
-         0.38
-         0.31
-         0.24
-         0.19
-</constant>
-        <constant cols="1" digits="0" name="wwMapBins" rows="8">
-         10.0
-         20.0
-         30.0
-         40.0
-         50.0
-         60.0
-         70.0
-         80.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
-         0.38
-         0.55
-         0.69
-         0.86
-         0.9
-         0.95
-         0.97
-         1.0
-</constant>
-        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
-         0.21
-         0.4
-         0.6
-         0.79
-         0.85
-         0.9
-         0.95
-         1.0
-</constant>
         <constant cols="6" digits="0" name="torqueTable" rows="6">
          0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0
@@ -1703,7 +1417,6 @@
          0.0
          0.0
 </constant>
-        <constant digits="0" name="unused3124141" units="">0.0</constant>
         <constant name="fuelPressureSensorMode">"Absolute"</constant>
         <constant name="luaDigitalInputPins1">"NONE"</constant>
         <constant name="luaDigitalInputPins2">"NONE"</constant>
@@ -1713,12 +1426,6 @@
         <constant name="luaDigitalInputPins6">"NONE"</constant>
         <constant name="luaDigitalInputPins7">"NONE"</constant>
         <constant name="luaDigitalInputPins8">"NONE"</constant>
-        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
-         650.0
-         800.0
-         3750.0
-         7000.0
-</constant>
         <constant digits="0" name="ALSMinRPM" units="rpm">400.0</constant>
         <constant digits="0" name="ALSMaxRPM" units="rpm">3200.0</constant>
         <constant digits="0" name="ALSMaxDuration" units="sec">3.0</constant>
@@ -1894,7 +1601,124 @@
         <constant name="spi5MisoMode">"default"</constant>
         <constant name="spi6SckMode">"default"</constant>
         <constant name="spi6MosiMode">"default"</constant>
-        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="120">
+        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
+        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="236">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
          0.0
          0.0
          0.0
@@ -2380,40 +2204,22 @@
          40.0
          40.0
 </constant>
-        <constant cols="1" digits="0" name="unusedGapInCalibration" rows="32">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
+        <constant digits="0" name="fancyOptions1" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions2" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions3" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions4" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions5" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions6" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions7" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions8" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions9" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions10" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions11" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions12" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions13" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions14" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions15" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions16" units="">0.0</constant>
         <constant cols="8" digits="1" name="boostTableOpenLoop" rows="8">
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
@@ -4554,9 +4360,297 @@ end</constant>
          3600.0
          5000.0
          7000.0
+</constant>
+        <constant cols="1" digits="0" name="wwCltBins" rows="8">
+         -40.0
+         -20.0
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
+         1.45
+         1.3
+         1.17
+         1.05
+         0.9
+         0.82
+         0.75
+         0.7
+</constant>
+        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
+         0.73
+         0.66
+         0.57
+         0.46
+         0.38
+         0.31
+         0.24
+         0.19
+</constant>
+        <constant cols="1" digits="0" name="wwMapBins" rows="8">
+         10.0
+         20.0
+         30.0
+         40.0
+         50.0
+         60.0
+         70.0
+         80.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
+         0.38
+         0.55
+         0.69
+         0.86
+         0.9
+         0.95
+         0.97
+         1.0
+</constant>
+        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
+         0.21
+         0.4
+         0.6
+         0.79
+         0.85
+         0.9
+         0.95
+         1.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
+         0.0
+         1.0
+         4.5
+         9.5
+         16.5
+         25.0
+         34.5
+         45.0
+         55.0
+         65.5
+         75.0
+         83.5
+         90.5
+         95.5
+         99.0
+         100.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
+         0.0
+         7.5
+         16.5
+         24.0
+         32.0
+         40.0
+         48.0
+         56.0
+         64.0
+         72.0
+         80.0
+         88.0
+         96.0
+         103.5
+         112.5
+         120.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         15.0
+         16.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+         120.0
+         140.0
+         160.0
+         180.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
+         0.005
+         0.018
+         0.031
+         0.043
+         0.056
+         0.069
+         0.082
+         0.094
+         0.107
+         0.12
+</constant>
+        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
+         650.0
+         800.0
+         1100.0
+         1400.0
+         1700.0
+         2000.0
+         2300.0
+         2600.0
+         2900.0
+         3200.0
+         3500.0
+         3800.0
+         4100.0
+         4400.0
+         4700.0
+         7000.0
+</constant>
+        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+</constant>
+        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
+         650.0
+         800.0
+         3750.0
+         7000.0
+</constant>
+        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
+         1.0
+         1.0
+         1.0
+         1.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
+         -20.0
+         0.0
+         40.0
+         80.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
+         0.0
+         0.71
+         1.43
+         2.14
+         2.86
+         3.57
+         4.29
+         5.0
+</constant>
+        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         14.0
+         15.0
+</constant>
+        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.19.XXX.4275859823" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.22.XXX.4019883890" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_MAZDA_MIATA_NA96.msq b/generated/simulator_tune_MAZDA_MIATA_NA96.msq
index b20f8a1..afd8fb8 100644
--- a/generated/simulator_tune_MAZDA_MIATA_NA96.msq
+++ b/generated/simulator_tune_MAZDA_MIATA_NA96.msq
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <msq xmlns="http://www.msefi.com/:msq">
     <page/>
-    <page number="0" size="22428">
+    <page number="0" size="22400">
         <constant name="engineType">"MAZDA_MIATA_NA96"</constant>
         <constant digits="0" name="startButtonSuppressOnStartUpMs" units="">0.0</constant>
         <constant digits="0" name="sensorSnifferRpmThreshold" units="RPM">2500.0</constant>
@@ -12,26 +12,25 @@
         <constant digits="0" name="maxAcRpm" units="rpm">5000.0</constant>
         <constant digits="0" name="maxAcTps" units="%">75.0</constant>
         <constant digits="0" name="maxAcClt" units="deg C">100.0</constant>
-        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
-         650.0
-         800.0
-         1100.0
-         1400.0
-         1700.0
-         2000.0
-         2300.0
-         2600.0
-         2900.0
-         3200.0
-         3500.0
-         3800.0
-         4100.0
-         4400.0
-         4700.0
-         7000.0
-</constant>
+        <constant digits="1" name="compressionRatio" units="CR">9.1</constant>
+        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
+        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
+        <constant name="mainRelayPin">"NONE"</constant>
+        <constant name="sdCardCsPin">"NONE"</constant>
+        <constant name="canTxPin">"NONE"</constant>
+        <constant name="canRxPin">"NONE"</constant>
+        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
+        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
+        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
+        <constant name="tachOutputPin">"NONE"</constant>
+        <constant name="tachOutputPinMode">"default"</constant>
+        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
+        <constant digits="0" name="manIdlePosition" units="%">20.0</constant>
         <constant digits="0" name="multisparkMaxSparkingAngle" units="deg">30.0</constant>
         <constant digits="0" name="multisparkMaxExtraSparkCount" units="count">2.0</constant>
+        <constant digits="0" name="vvtControlMinRpm" units="RPM">500.0</constant>
         <constant digits="2" name="injector_flow" units="cm3/min">265.0</constant>
         <constant cols="1" digits="2" name="injector_battLagCorrBins" rows="8">
          6.0
@@ -182,6 +181,7 @@
         <constant digits="0" name="triggerSimulatorRpm" units="RPM">1200.0</constant>
         <constant digits="0" name="cylindersCount" units="">4.0</constant>
         <constant name="firingOrder">"1-3-4-2"</constant>
+        <constant digits="0" name="justATempTest" units="">0.0</constant>
         <constant name="communityCommsLedPid">"NONE"</constant>
         <constant digits="2" name="cylinderBore" units="mm">83.0</constant>
         <constant name="fuelAlgorithm">"Speed Density"</constant>
@@ -195,8 +195,10 @@
         <constant name="ignitionMode">"Wasted Spark"</constant>
         <constant digits="0" name="gapTrackingLengthOverride" units="count">0.0</constant>
         <constant digits="0" name="maxIdleVss" units="kph">0.0</constant>
+        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
         <constant digits="0" name="minOilPressureAfterStart" units="kPa">0.0</constant>
         <constant name="timingMode">"dynamic"</constant>
+        <constant name="canNbcType">"None"</constant>
         <constant digits="0" name="fixedModeTiming" units="RPM">50.0</constant>
         <constant digits="0" name="globalTriggerAngleOffset" units="deg btdc">0.0</constant>
         <constant digits="2" name="analogInputDividerCoefficient" units="coef">2.0</constant>
@@ -205,12 +207,7 @@
         <constant digits="0" name="fanOffTemperature" units="deg C">88.0</constant>
         <constant name="acrPin">"NONE"</constant>
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">551.0</constant>
-        <constant name="canNbcType">"None"</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
-        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
-        <constant digits="0" name="justATempTest" units="">0.0</constant>
-        <constant digits="0" name="unusedHere333" units="">0.0</constant>
-        <constant digits="0" name="unusedHere334" units="">0.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
         <constant name="tps1_1AdcChannel">"Disabled"</constant>
         <constant name="vbattAdcChannel">"Disabled"</constant>
@@ -226,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.0240319E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240322E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -254,12 +251,12 @@
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
         <constant name="idle_stepperStepPin">"NONE"</constant>
         <constant name="idle_solenoidPinMode">"default"</constant>
-        <constant digits="0" name="manIdlePosition" units="%">20.0</constant>
         <constant digits="1" name="knockRetardAggression" units="%">20.0</constant>
         <constant digits="1" name="knockRetardReapplyRate" units="deg/s">3.0</constant>
         <constant name="engineSyncCam">"Intake First Bank"</constant>
-        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
+        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="3" name="vssGearRatio" units="ratio">1.122</constant>
+        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
         <constant digits="0" name="vssToothCount" units="count">4.0</constant>
         <constant name="idleVeOverrideMode">"None"</constant>
         <constant name="l9779_cs">"NONE"</constant>
@@ -308,22 +305,13 @@
         <constant name="max31855spiDevice">"Off"</constant>
         <constant name="debugTriggerSync">"NONE"</constant>
         <constant name="digitalPotentiometerSpiDevice">"Off"</constant>
+        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
         <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
         <constant name="tps1_2AdcChannel">"Disabled"</constant>
         <constant name="tps2_2AdcChannel">"Disabled"</constant>
         <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
-        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.03</constant>
@@ -331,23 +319,10 @@
         <constant name="triggerInputPins2">"NONE"</constant>
         <constant digits="0" name="mc33_t_min_boost" units="us">100.0</constant>
         <constant name="hip9011CsPinMode">"default"</constant>
-        <constant name="tachOutputPin">"NONE"</constant>
-        <constant name="tachOutputPinMode">"default"</constant>
-        <constant name="mainRelayPin">"NONE"</constant>
-        <constant name="sdCardCsPin">"NONE"</constant>
-        <constant name="canTxPin">"NONE"</constant>
-        <constant name="canRxPin">"NONE"</constant>
         <constant name="throttlePedalUpPinMode">"DEFAULT"</constant>
-        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
         <constant digits="2" name="finalGearRatio" units="ratio">4.3</constant>
         <constant name="tcuInputSpeedSensorPin">"NONE"</constant>
         <constant digits="0" name="tcuInputSpeedSensorTeeth" units="">1.0</constant>
-        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
-        <constant digits="1" name="compressionRatio" units="CR">9.1</constant>
         <constant name="triggerSimulatorPins1">"NONE"</constant>
         <constant name="triggerSimulatorPins2">"NONE"</constant>
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
@@ -403,27 +378,7 @@
         <constant name="acFanPin">"NONE"</constant>
         <constant name="acFanPinMode">"default"</constant>
         <constant name="l9779spiDevice">"Off"</constant>
-        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         14.0
-         15.0
-</constant>
         <constant name="imuType">"None"</constant>
-        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="vehicleWeight" units="kg">950.0</constant>
         <constant digits="0" name="idlePidRpmUpperLimit" units="RPM">350.0</constant>
         <constant digits="3" name="applyNonlinearBelowPulse" units="ms">0.0</constant>
@@ -454,6 +409,8 @@
         <constant name="starterRelayDisablePinMode">"default"</constant>
         <constant name="secondSolenoidPin">"NONE"</constant>
         <constant name="startStopButtonPin">"NONE"</constant>
+        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
+        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="0" name="mapMinBufferLength" units="count">1.0</constant>
         <constant digits="0" name="idlePidDeactivationTpsThreshold" units="%">5.0</constant>
         <constant digits="0" name="stepperParkingExtraSteps" units="%">0.0</constant>
@@ -466,8 +423,6 @@
         <constant name="acRelayPin">"NONE"</constant>
         <constant digits="0" name="lambdaProtectionMinTps" units="%">50.0</constant>
         <constant digits="1" name="lambdaProtectionTimeout" units="s">0.5</constant>
-        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
-        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="2" name="scriptSetting1" units="">0.0</constant>
         <constant digits="2" name="scriptSetting2" units="">0.0</constant>
         <constant digits="2" name="scriptSetting3" units="">0.0</constant>
@@ -546,6 +501,8 @@
         <constant digits="0" name="boostPwmFrequency" units="Hz">33.0</constant>
         <constant name="launchActivationMode">"Launch Button"</constant>
         <constant name="antiLagActivationMode">"Switch Input"</constant>
+        <constant digits="2" name="tpsAccelLookback" units="sec">0.0</constant>
+        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="0" name="launchSpeedThreshold" units="Kph">30.0</constant>
         <constant digits="0" name="launchRpmWindow" units="RPM">500.0</constant>
         <constant digits="0" name="launchSparkSkipPercent" units="%">0.0</constant>
@@ -596,16 +553,6 @@
         <constant name="drv8860_cs">"NONE"</constant>
         <constant name="drv8860_csPinMode">"default"</constant>
         <constant name="drv8860_miso">"NONE"</constant>
-        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
-         0.0
-         0.71
-         1.43
-         2.14
-         2.86
-         3.57
-         4.29
-         5.0
-</constant>
         <constant name="luaOutputPins1">"NONE"</constant>
         <constant name="luaOutputPins2">"NONE"</constant>
         <constant name="luaOutputPins3">"NONE"</constant>
@@ -811,10 +758,8 @@
         <constant name="auxSerialTxPin">"NONE"</constant>
         <constant name="auxSerialRxPin">"NONE"</constant>
         <constant name="accelerometerCsPin">"NONE"</constant>
-        <constant digits="2" name="tpsAccelLookback" units="sec">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssLow" units="kph">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssHigh" units="kph">0.0</constant>
-        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="1" name="tpsAccelEnrichmentThreshold" units="roc">40.0</constant>
         <constant name="auxSpeedSensorInputPin1">"NONE"</constant>
         <constant name="auxSpeedSensorInputPin2">"NONE"</constant>
@@ -903,7 +848,6 @@
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
-        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="0" name="crankingIACposition" units="percent">36.0</constant>
         <constant digits="4" name="tChargeMinRpmMinTps" units="">0.25</constant>
         <constant digits="4" name="tChargeMinRpmMaxTps" units="">0.25</constant>
@@ -1021,7 +965,6 @@
         <constant name="mc33816_rstb">"NONE"</constant>
         <constant name="mc33816_driven">"NONE"</constant>
         <constant name="brakePedalPin">"NONE"</constant>
-        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant digits="4" name="auxPid1_pFactor" units="">2.0</constant>
         <constant digits="4" name="auxPid1_iFactor" units="">0.005</constant>
         <constant digits="4" name="auxPid1_dFactor" units="">0.0</constant>
@@ -1068,12 +1011,7 @@
         <constant name="tle8888_csPinMode">"default"</constant>
         <constant name="mc33816_cs">"NONE"</constant>
         <constant digits="1" name="auxFrequencyFilter" units="hz">0.0</constant>
-        <constant digits="0" name="vvtControlMinRpm" units="RPM">500.0</constant>
         <constant name="sentInputPins1">"NONE"</constant>
-        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
-        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
-        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
-        <constant digits="0" name="unused645646" units="">0.0</constant>
         <constant digits="0" name="coastingFuelCutRpmHigh" units="rpm">1500.0</constant>
         <constant digits="0" name="coastingFuelCutRpmLow" units="rpm">1300.0</constant>
         <constant digits="0" name="coastingFuelCutTps" units="%">2.0</constant>
@@ -1090,24 +1028,11 @@
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value2" units="">0.0</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
-         -20.0
-         0.0
-         40.0
-         80.0
-</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant digits="3" name="tChargeAirCoefMin" units="">0.098</constant>
         <constant digits="3" name="tChargeAirCoefMax" units="">0.902</constant>
         <constant digits="1" name="tChargeAirFlowMax" units="kg/h">153.6</constant>
         <constant digits="1" name="tChargeAirIncrLimit" units="deg/sec">1.0</constant>
         <constant digits="1" name="tChargeAirDecrLimit" units="deg/sec">12.5</constant>
-        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="2" name="hip9011Gain" units="">1.0</constant>
         <constant digits="0" name="etb_iTermMin" units="">-30.0</constant>
         <constant digits="0" name="etb_iTermMax" units="">30.0</constant>
@@ -1129,10 +1054,10 @@
         <constant digits="1" name="stoichRatioPrimary" units=":1">14.7</constant>
         <constant digits="0" name="idlerpmpid_iTermMax" units="">30.0</constant>
         <constant digits="0" name="etbIdleThrottleRange" units="%">15.0</constant>
-        <constant digits="0" name="cylinderBankSelect1" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect2" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect3" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect4" units="">0.0</constant>
+        <constant digits="0" name="cylinderBankSelect1" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect2" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect3" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect4" units="">1.0</constant>
         <constant digits="0" name="cylinderBankSelect5" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect6" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect7" units="">0.0</constant>
@@ -1340,24 +1265,6 @@
         <constant name="tcu_solenoid_mode4">"default"</constant>
         <constant name="tcu_solenoid_mode5">"default"</constant>
         <constant name="tcu_solenoid_mode6">"default"</constant>
-        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-</constant>
         <constant digits="3" name="triggerGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom2" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom3" units="ratio">0.0</constant>
@@ -1397,13 +1304,8 @@
         <constant digits="0" name="maxCamPhaseResolveRpm" units="rpm">0.0</constant>
         <constant digits="1" name="dfcoDelay" units="sec">0.0</constant>
         <constant digits="1" name="acDelay" units="sec">0.5</constant>
+        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="3" name="fordInjectorSmallPulseBreakPoint" units="mg">0.0</constant>
-        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="etbJamIntegratorLimit" units="%">0.0</constant>
         <constant digits="0" name="hpfpCamLobes" units="lobes/cam">3.0</constant>
         <constant name="hpfpCam">"NONE"</constant>
@@ -1415,134 +1317,6 @@
         <constant digits="3" name="hpfpPidP" units="%/kPa">0.01</constant>
         <constant digits="5" name="hpfpPidI" units="%/kPa/lobe">3.0E-4</constant>
         <constant digits="0" name="hpfpTargetDecay" units="kPa/s">2000.0</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
-         0.0
-         1.0
-         4.5
-         9.5
-         16.5
-         25.0
-         34.5
-         45.0
-         55.0
-         65.5
-         75.0
-         83.5
-         90.5
-         95.5
-         99.0
-         100.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
-         0.0
-         7.5
-         16.5
-         24.0
-         32.0
-         40.0
-         48.0
-         56.0
-         64.0
-         72.0
-         80.0
-         88.0
-         96.0
-         103.5
-         112.5
-         120.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         15.0
-         16.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-         120.0
-         140.0
-         160.0
-         180.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
-         0.005
-         0.018
-         0.031
-         0.043
-         0.056
-         0.069
-         0.082
-         0.094
-         0.107
-         0.12
-</constant>
-        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
         <constant name="stepper_raw_output1">"NONE"</constant>
         <constant name="stepper_raw_output2">"NONE"</constant>
         <constant name="stepper_raw_output3">"NONE"</constant>
@@ -1558,66 +1332,6 @@
         <constant digits="2" name="gearRatio9" units="ratio">0.0</constant>
         <constant digits="2" name="gearRatio10" units="ratio">0.0</constant>
         <constant digits="0" name="vvtActivationDelayMs" units="ms">6000.0</constant>
-        <constant cols="1" digits="0" name="wwCltBins" rows="8">
-         -40.0
-         -20.0
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
-         1.45
-         1.3
-         1.17
-         1.05
-         0.9
-         0.82
-         0.75
-         0.7
-</constant>
-        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
-         0.73
-         0.66
-         0.57
-         0.46
-         0.38
-         0.31
-         0.24
-         0.19
-</constant>
-        <constant cols="1" digits="0" name="wwMapBins" rows="8">
-         10.0
-         20.0
-         30.0
-         40.0
-         50.0
-         60.0
-         70.0
-         80.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
-         0.38
-         0.55
-         0.69
-         0.86
-         0.9
-         0.95
-         0.97
-         1.0
-</constant>
-        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
-         0.21
-         0.4
-         0.6
-         0.79
-         0.85
-         0.9
-         0.95
-         1.0
-</constant>
         <constant cols="6" digits="0" name="torqueTable" rows="6">
          0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0
@@ -1703,7 +1417,6 @@
          0.0
          0.0
 </constant>
-        <constant digits="0" name="unused3124141" units="">0.0</constant>
         <constant name="fuelPressureSensorMode">"Absolute"</constant>
         <constant name="luaDigitalInputPins1">"NONE"</constant>
         <constant name="luaDigitalInputPins2">"NONE"</constant>
@@ -1713,12 +1426,6 @@
         <constant name="luaDigitalInputPins6">"NONE"</constant>
         <constant name="luaDigitalInputPins7">"NONE"</constant>
         <constant name="luaDigitalInputPins8">"NONE"</constant>
-        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
-         650.0
-         800.0
-         3750.0
-         7000.0
-</constant>
         <constant digits="0" name="ALSMinRPM" units="rpm">400.0</constant>
         <constant digits="0" name="ALSMaxRPM" units="rpm">3200.0</constant>
         <constant digits="0" name="ALSMaxDuration" units="sec">3.0</constant>
@@ -1894,7 +1601,124 @@
         <constant name="spi5MisoMode">"default"</constant>
         <constant name="spi6SckMode">"default"</constant>
         <constant name="spi6MosiMode">"default"</constant>
-        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="120">
+        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
+        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="236">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
          0.0
          0.0
          0.0
@@ -2380,40 +2204,22 @@
          40.0
          40.0
 </constant>
-        <constant cols="1" digits="0" name="unusedGapInCalibration" rows="32">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
+        <constant digits="0" name="fancyOptions1" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions2" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions3" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions4" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions5" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions6" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions7" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions8" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions9" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions10" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions11" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions12" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions13" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions14" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions15" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions16" units="">0.0</constant>
         <constant cols="8" digits="1" name="boostTableOpenLoop" rows="8">
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
@@ -4554,9 +4360,297 @@ end</constant>
          3600.0
          5000.0
          7000.0
+</constant>
+        <constant cols="1" digits="0" name="wwCltBins" rows="8">
+         -40.0
+         -20.0
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
+         1.45
+         1.3
+         1.17
+         1.05
+         0.9
+         0.82
+         0.75
+         0.7
+</constant>
+        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
+         0.73
+         0.66
+         0.57
+         0.46
+         0.38
+         0.31
+         0.24
+         0.19
+</constant>
+        <constant cols="1" digits="0" name="wwMapBins" rows="8">
+         10.0
+         20.0
+         30.0
+         40.0
+         50.0
+         60.0
+         70.0
+         80.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
+         0.38
+         0.55
+         0.69
+         0.86
+         0.9
+         0.95
+         0.97
+         1.0
+</constant>
+        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
+         0.21
+         0.4
+         0.6
+         0.79
+         0.85
+         0.9
+         0.95
+         1.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
+         0.0
+         1.0
+         4.5
+         9.5
+         16.5
+         25.0
+         34.5
+         45.0
+         55.0
+         65.5
+         75.0
+         83.5
+         90.5
+         95.5
+         99.0
+         100.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
+         0.0
+         7.5
+         16.5
+         24.0
+         32.0
+         40.0
+         48.0
+         56.0
+         64.0
+         72.0
+         80.0
+         88.0
+         96.0
+         103.5
+         112.5
+         120.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         15.0
+         16.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+         120.0
+         140.0
+         160.0
+         180.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
+         0.005
+         0.018
+         0.031
+         0.043
+         0.056
+         0.069
+         0.082
+         0.094
+         0.107
+         0.12
+</constant>
+        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
+         650.0
+         800.0
+         1100.0
+         1400.0
+         1700.0
+         2000.0
+         2300.0
+         2600.0
+         2900.0
+         3200.0
+         3500.0
+         3800.0
+         4100.0
+         4400.0
+         4700.0
+         7000.0
+</constant>
+        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+</constant>
+        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
+         650.0
+         800.0
+         3750.0
+         7000.0
+</constant>
+        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
+         1.0
+         1.0
+         1.0
+         1.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
+         -20.0
+         0.0
+         40.0
+         80.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
+         0.0
+         0.71
+         1.43
+         2.14
+         2.86
+         3.57
+         4.29
+         5.0
+</constant>
+        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         14.0
+         15.0
+</constant>
+        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.19.XXX.4275859823" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.22.XXX.4019883890" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_MAZDA_MIATA_NB1.msq b/generated/simulator_tune_MAZDA_MIATA_NB1.msq
index 1abb663..9a155ce 100644
--- a/generated/simulator_tune_MAZDA_MIATA_NB1.msq
+++ b/generated/simulator_tune_MAZDA_MIATA_NB1.msq
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <msq xmlns="http://www.msefi.com/:msq">
     <page/>
-    <page number="0" size="22428">
+    <page number="0" size="22400">
         <constant name="engineType">"MAZDA_MIATA_NB1"</constant>
         <constant digits="0" name="startButtonSuppressOnStartUpMs" units="">0.0</constant>
         <constant digits="0" name="sensorSnifferRpmThreshold" units="RPM">2500.0</constant>
@@ -12,26 +12,25 @@
         <constant digits="0" name="maxAcRpm" units="rpm">5000.0</constant>
         <constant digits="0" name="maxAcTps" units="%">75.0</constant>
         <constant digits="0" name="maxAcClt" units="deg C">100.0</constant>
-        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
-         650.0
-         800.0
-         1100.0
-         1400.0
-         1700.0
-         2000.0
-         2300.0
-         2600.0
-         2900.0
-         3200.0
-         3500.0
-         3800.0
-         4100.0
-         4400.0
-         4700.0
-         7000.0
-</constant>
+        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
+        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
+        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
+        <constant name="mainRelayPin">"NONE"</constant>
+        <constant name="sdCardCsPin">"NONE"</constant>
+        <constant name="canTxPin">"NONE"</constant>
+        <constant name="canRxPin">"NONE"</constant>
+        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
+        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
+        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
+        <constant name="tachOutputPin">"NONE"</constant>
+        <constant name="tachOutputPinMode">"default"</constant>
+        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
+        <constant digits="0" name="manIdlePosition" units="%">20.0</constant>
         <constant digits="0" name="multisparkMaxSparkingAngle" units="deg">30.0</constant>
         <constant digits="0" name="multisparkMaxExtraSparkCount" units="count">2.0</constant>
+        <constant digits="0" name="vvtControlMinRpm" units="RPM">500.0</constant>
         <constant digits="2" name="injector_flow" units="cm3/min">256.0</constant>
         <constant cols="1" digits="2" name="injector_battLagCorrBins" rows="8">
          6.0
@@ -182,6 +181,7 @@
         <constant digits="0" name="triggerSimulatorRpm" units="RPM">1200.0</constant>
         <constant digits="0" name="cylindersCount" units="">4.0</constant>
         <constant name="firingOrder">"1-3-4-2"</constant>
+        <constant digits="0" name="justATempTest" units="">0.0</constant>
         <constant name="communityCommsLedPid">"NONE"</constant>
         <constant digits="2" name="cylinderBore" units="mm">83.0</constant>
         <constant name="fuelAlgorithm">"Speed Density"</constant>
@@ -195,8 +195,10 @@
         <constant name="ignitionMode">"Wasted Spark"</constant>
         <constant digits="0" name="gapTrackingLengthOverride" units="count">0.0</constant>
         <constant digits="0" name="maxIdleVss" units="kph">0.0</constant>
+        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
         <constant digits="0" name="minOilPressureAfterStart" units="kPa">0.0</constant>
         <constant name="timingMode">"dynamic"</constant>
+        <constant name="canNbcType">"None"</constant>
         <constant digits="0" name="fixedModeTiming" units="RPM">50.0</constant>
         <constant digits="0" name="globalTriggerAngleOffset" units="deg btdc">0.0</constant>
         <constant digits="2" name="analogInputDividerCoefficient" units="coef">2.0</constant>
@@ -205,12 +207,7 @@
         <constant digits="0" name="fanOffTemperature" units="deg C">88.0</constant>
         <constant name="acrPin">"NONE"</constant>
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">551.0</constant>
-        <constant name="canNbcType">"None"</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
-        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
-        <constant digits="0" name="justATempTest" units="">0.0</constant>
-        <constant digits="0" name="unusedHere333" units="">0.0</constant>
-        <constant digits="0" name="unusedHere334" units="">0.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
         <constant name="tps1_1AdcChannel">"Disabled"</constant>
         <constant name="vbattAdcChannel">"Disabled"</constant>
@@ -226,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.0240319E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240322E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -254,12 +251,12 @@
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
         <constant name="idle_stepperStepPin">"NONE"</constant>
         <constant name="idle_solenoidPinMode">"default"</constant>
-        <constant digits="0" name="manIdlePosition" units="%">20.0</constant>
         <constant digits="1" name="knockRetardAggression" units="%">20.0</constant>
         <constant digits="1" name="knockRetardReapplyRate" units="deg/s">3.0</constant>
         <constant name="engineSyncCam">"Intake First Bank"</constant>
-        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
+        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="3" name="vssGearRatio" units="ratio">1.117</constant>
+        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
         <constant digits="0" name="vssToothCount" units="count">4.0</constant>
         <constant name="idleVeOverrideMode">"None"</constant>
         <constant name="l9779_cs">"NONE"</constant>
@@ -308,22 +305,13 @@
         <constant name="max31855spiDevice">"Off"</constant>
         <constant name="debugTriggerSync">"NONE"</constant>
         <constant name="digitalPotentiometerSpiDevice">"Off"</constant>
+        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
         <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
         <constant name="tps1_2AdcChannel">"Disabled"</constant>
         <constant name="tps2_2AdcChannel">"Disabled"</constant>
         <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
-        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.03</constant>
@@ -331,23 +319,10 @@
         <constant name="triggerInputPins2">"NONE"</constant>
         <constant digits="0" name="mc33_t_min_boost" units="us">100.0</constant>
         <constant name="hip9011CsPinMode">"default"</constant>
-        <constant name="tachOutputPin">"NONE"</constant>
-        <constant name="tachOutputPinMode">"default"</constant>
-        <constant name="mainRelayPin">"NONE"</constant>
-        <constant name="sdCardCsPin">"NONE"</constant>
-        <constant name="canTxPin">"NONE"</constant>
-        <constant name="canRxPin">"NONE"</constant>
         <constant name="throttlePedalUpPinMode">"DEFAULT"</constant>
-        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
         <constant digits="2" name="finalGearRatio" units="ratio">4.3</constant>
         <constant name="tcuInputSpeedSensorPin">"NONE"</constant>
         <constant digits="0" name="tcuInputSpeedSensorTeeth" units="">1.0</constant>
-        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
-        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
         <constant name="triggerSimulatorPins1">"NONE"</constant>
         <constant name="triggerSimulatorPins2">"NONE"</constant>
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
@@ -403,27 +378,7 @@
         <constant name="acFanPin">"NONE"</constant>
         <constant name="acFanPinMode">"default"</constant>
         <constant name="l9779spiDevice">"Off"</constant>
-        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         14.0
-         15.0
-</constant>
         <constant name="imuType">"None"</constant>
-        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="vehicleWeight" units="kg">1070.0</constant>
         <constant digits="0" name="idlePidRpmUpperLimit" units="RPM">350.0</constant>
         <constant digits="3" name="applyNonlinearBelowPulse" units="ms">0.0</constant>
@@ -454,6 +409,8 @@
         <constant name="starterRelayDisablePinMode">"default"</constant>
         <constant name="secondSolenoidPin">"NONE"</constant>
         <constant name="startStopButtonPin">"NONE"</constant>
+        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
+        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="0" name="mapMinBufferLength" units="count">1.0</constant>
         <constant digits="0" name="idlePidDeactivationTpsThreshold" units="%">5.0</constant>
         <constant digits="0" name="stepperParkingExtraSteps" units="%">0.0</constant>
@@ -466,8 +423,6 @@
         <constant name="acRelayPin">"NONE"</constant>
         <constant digits="0" name="lambdaProtectionMinTps" units="%">50.0</constant>
         <constant digits="1" name="lambdaProtectionTimeout" units="s">0.5</constant>
-        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
-        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="2" name="scriptSetting1" units="">0.0</constant>
         <constant digits="2" name="scriptSetting2" units="">0.0</constant>
         <constant digits="2" name="scriptSetting3" units="">0.0</constant>
@@ -546,6 +501,8 @@
         <constant digits="0" name="boostPwmFrequency" units="Hz">33.0</constant>
         <constant name="launchActivationMode">"Launch Button"</constant>
         <constant name="antiLagActivationMode">"Switch Input"</constant>
+        <constant digits="2" name="tpsAccelLookback" units="sec">0.0</constant>
+        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="0" name="launchSpeedThreshold" units="Kph">30.0</constant>
         <constant digits="0" name="launchRpmWindow" units="RPM">500.0</constant>
         <constant digits="0" name="launchSparkSkipPercent" units="%">0.0</constant>
@@ -596,16 +553,6 @@
         <constant name="drv8860_cs">"NONE"</constant>
         <constant name="drv8860_csPinMode">"default"</constant>
         <constant name="drv8860_miso">"NONE"</constant>
-        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
-         0.0
-         0.71
-         1.43
-         2.14
-         2.86
-         3.57
-         4.29
-         5.0
-</constant>
         <constant name="luaOutputPins1">"NONE"</constant>
         <constant name="luaOutputPins2">"NONE"</constant>
         <constant name="luaOutputPins3">"NONE"</constant>
@@ -811,10 +758,8 @@
         <constant name="auxSerialTxPin">"NONE"</constant>
         <constant name="auxSerialRxPin">"NONE"</constant>
         <constant name="accelerometerCsPin">"NONE"</constant>
-        <constant digits="2" name="tpsAccelLookback" units="sec">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssLow" units="kph">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssHigh" units="kph">0.0</constant>
-        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="1" name="tpsAccelEnrichmentThreshold" units="roc">40.0</constant>
         <constant name="auxSpeedSensorInputPin1">"NONE"</constant>
         <constant name="auxSpeedSensorInputPin2">"NONE"</constant>
@@ -903,7 +848,6 @@
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
-        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="0" name="crankingIACposition" units="percent">60.0</constant>
         <constant digits="4" name="tChargeMinRpmMinTps" units="">0.25</constant>
         <constant digits="4" name="tChargeMinRpmMaxTps" units="">0.25</constant>
@@ -1021,7 +965,6 @@
         <constant name="mc33816_rstb">"NONE"</constant>
         <constant name="mc33816_driven">"NONE"</constant>
         <constant name="brakePedalPin">"NONE"</constant>
-        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant digits="4" name="auxPid1_pFactor" units="">2.0</constant>
         <constant digits="4" name="auxPid1_iFactor" units="">0.005</constant>
         <constant digits="4" name="auxPid1_dFactor" units="">0.0</constant>
@@ -1068,12 +1011,7 @@
         <constant name="tle8888_csPinMode">"default"</constant>
         <constant name="mc33816_cs">"NONE"</constant>
         <constant digits="1" name="auxFrequencyFilter" units="hz">0.0</constant>
-        <constant digits="0" name="vvtControlMinRpm" units="RPM">500.0</constant>
         <constant name="sentInputPins1">"NONE"</constant>
-        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
-        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
-        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
-        <constant digits="0" name="unused645646" units="">0.0</constant>
         <constant digits="0" name="coastingFuelCutRpmHigh" units="rpm">1500.0</constant>
         <constant digits="0" name="coastingFuelCutRpmLow" units="rpm">1300.0</constant>
         <constant digits="0" name="coastingFuelCutTps" units="%">2.0</constant>
@@ -1090,24 +1028,11 @@
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value2" units="">0.0</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
-         -20.0
-         0.0
-         40.0
-         80.0
-</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant digits="3" name="tChargeAirCoefMin" units="">0.098</constant>
         <constant digits="3" name="tChargeAirCoefMax" units="">0.902</constant>
         <constant digits="1" name="tChargeAirFlowMax" units="kg/h">153.6</constant>
         <constant digits="1" name="tChargeAirIncrLimit" units="deg/sec">1.0</constant>
         <constant digits="1" name="tChargeAirDecrLimit" units="deg/sec">12.5</constant>
-        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="2" name="hip9011Gain" units="">1.0</constant>
         <constant digits="0" name="etb_iTermMin" units="">-30.0</constant>
         <constant digits="0" name="etb_iTermMax" units="">30.0</constant>
@@ -1129,10 +1054,10 @@
         <constant digits="1" name="stoichRatioPrimary" units=":1">14.7</constant>
         <constant digits="0" name="idlerpmpid_iTermMax" units="">30.0</constant>
         <constant digits="0" name="etbIdleThrottleRange" units="%">15.0</constant>
-        <constant digits="0" name="cylinderBankSelect1" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect2" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect3" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect4" units="">0.0</constant>
+        <constant digits="0" name="cylinderBankSelect1" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect2" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect3" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect4" units="">1.0</constant>
         <constant digits="0" name="cylinderBankSelect5" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect6" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect7" units="">0.0</constant>
@@ -1340,24 +1265,6 @@
         <constant name="tcu_solenoid_mode4">"default"</constant>
         <constant name="tcu_solenoid_mode5">"default"</constant>
         <constant name="tcu_solenoid_mode6">"default"</constant>
-        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-</constant>
         <constant digits="3" name="triggerGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom2" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom3" units="ratio">0.0</constant>
@@ -1397,13 +1304,8 @@
         <constant digits="0" name="maxCamPhaseResolveRpm" units="rpm">0.0</constant>
         <constant digits="1" name="dfcoDelay" units="sec">0.0</constant>
         <constant digits="1" name="acDelay" units="sec">0.5</constant>
+        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="3" name="fordInjectorSmallPulseBreakPoint" units="mg">0.0</constant>
-        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="etbJamIntegratorLimit" units="%">0.0</constant>
         <constant digits="0" name="hpfpCamLobes" units="lobes/cam">3.0</constant>
         <constant name="hpfpCam">"NONE"</constant>
@@ -1415,134 +1317,6 @@
         <constant digits="3" name="hpfpPidP" units="%/kPa">0.01</constant>
         <constant digits="5" name="hpfpPidI" units="%/kPa/lobe">3.0E-4</constant>
         <constant digits="0" name="hpfpTargetDecay" units="kPa/s">2000.0</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
-         0.0
-         1.0
-         4.5
-         9.5
-         16.5
-         25.0
-         34.5
-         45.0
-         55.0
-         65.5
-         75.0
-         83.5
-         90.5
-         95.5
-         99.0
-         100.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
-         0.0
-         7.5
-         16.5
-         24.0
-         32.0
-         40.0
-         48.0
-         56.0
-         64.0
-         72.0
-         80.0
-         88.0
-         96.0
-         103.5
-         112.5
-         120.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         15.0
-         16.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-         120.0
-         140.0
-         160.0
-         180.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
-         0.005
-         0.018
-         0.031
-         0.043
-         0.056
-         0.069
-         0.082
-         0.094
-         0.107
-         0.12
-</constant>
-        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
         <constant name="stepper_raw_output1">"NONE"</constant>
         <constant name="stepper_raw_output2">"NONE"</constant>
         <constant name="stepper_raw_output3">"NONE"</constant>
@@ -1558,66 +1332,6 @@
         <constant digits="2" name="gearRatio9" units="ratio">0.0</constant>
         <constant digits="2" name="gearRatio10" units="ratio">0.0</constant>
         <constant digits="0" name="vvtActivationDelayMs" units="ms">6000.0</constant>
-        <constant cols="1" digits="0" name="wwCltBins" rows="8">
-         -40.0
-         -20.0
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
-         1.45
-         1.3
-         1.17
-         1.05
-         0.9
-         0.82
-         0.75
-         0.7
-</constant>
-        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
-         0.73
-         0.66
-         0.57
-         0.46
-         0.38
-         0.31
-         0.24
-         0.19
-</constant>
-        <constant cols="1" digits="0" name="wwMapBins" rows="8">
-         10.0
-         20.0
-         30.0
-         40.0
-         50.0
-         60.0
-         70.0
-         80.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
-         0.38
-         0.55
-         0.69
-         0.86
-         0.9
-         0.95
-         0.97
-         1.0
-</constant>
-        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
-         0.21
-         0.4
-         0.6
-         0.79
-         0.85
-         0.9
-         0.95
-         1.0
-</constant>
         <constant cols="6" digits="0" name="torqueTable" rows="6">
          0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0
@@ -1703,7 +1417,6 @@
          0.0
          0.0
 </constant>
-        <constant digits="0" name="unused3124141" units="">0.0</constant>
         <constant name="fuelPressureSensorMode">"Absolute"</constant>
         <constant name="luaDigitalInputPins1">"NONE"</constant>
         <constant name="luaDigitalInputPins2">"NONE"</constant>
@@ -1713,12 +1426,6 @@
         <constant name="luaDigitalInputPins6">"NONE"</constant>
         <constant name="luaDigitalInputPins7">"NONE"</constant>
         <constant name="luaDigitalInputPins8">"NONE"</constant>
-        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
-         650.0
-         800.0
-         3750.0
-         7000.0
-</constant>
         <constant digits="0" name="ALSMinRPM" units="rpm">400.0</constant>
         <constant digits="0" name="ALSMaxRPM" units="rpm">3200.0</constant>
         <constant digits="0" name="ALSMaxDuration" units="sec">3.0</constant>
@@ -1894,7 +1601,124 @@
         <constant name="spi5MisoMode">"default"</constant>
         <constant name="spi6SckMode">"default"</constant>
         <constant name="spi6MosiMode">"default"</constant>
-        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="120">
+        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
+        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="236">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
          0.0
          0.0
          0.0
@@ -2380,40 +2204,22 @@
          40.0
          40.0
 </constant>
-        <constant cols="1" digits="0" name="unusedGapInCalibration" rows="32">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
+        <constant digits="0" name="fancyOptions1" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions2" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions3" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions4" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions5" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions6" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions7" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions8" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions9" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions10" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions11" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions12" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions13" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions14" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions15" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions16" units="">0.0</constant>
         <constant cols="8" digits="1" name="boostTableOpenLoop" rows="8">
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
@@ -4554,9 +4360,297 @@ end</constant>
          3600.0
          5000.0
          7000.0
+</constant>
+        <constant cols="1" digits="0" name="wwCltBins" rows="8">
+         -40.0
+         -20.0
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
+         1.45
+         1.3
+         1.17
+         1.05
+         0.9
+         0.82
+         0.75
+         0.7
+</constant>
+        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
+         0.73
+         0.66
+         0.57
+         0.46
+         0.38
+         0.31
+         0.24
+         0.19
+</constant>
+        <constant cols="1" digits="0" name="wwMapBins" rows="8">
+         10.0
+         20.0
+         30.0
+         40.0
+         50.0
+         60.0
+         70.0
+         80.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
+         0.38
+         0.55
+         0.69
+         0.86
+         0.9
+         0.95
+         0.97
+         1.0
+</constant>
+        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
+         0.21
+         0.4
+         0.6
+         0.79
+         0.85
+         0.9
+         0.95
+         1.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
+         0.0
+         1.0
+         4.5
+         9.5
+         16.5
+         25.0
+         34.5
+         45.0
+         55.0
+         65.5
+         75.0
+         83.5
+         90.5
+         95.5
+         99.0
+         100.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
+         0.0
+         7.5
+         16.5
+         24.0
+         32.0
+         40.0
+         48.0
+         56.0
+         64.0
+         72.0
+         80.0
+         88.0
+         96.0
+         103.5
+         112.5
+         120.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         15.0
+         16.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+         120.0
+         140.0
+         160.0
+         180.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
+         0.005
+         0.018
+         0.031
+         0.043
+         0.056
+         0.069
+         0.082
+         0.094
+         0.107
+         0.12
+</constant>
+        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
+         650.0
+         800.0
+         1100.0
+         1400.0
+         1700.0
+         2000.0
+         2300.0
+         2600.0
+         2900.0
+         3200.0
+         3500.0
+         3800.0
+         4100.0
+         4400.0
+         4700.0
+         7000.0
+</constant>
+        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+</constant>
+        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
+         650.0
+         800.0
+         3750.0
+         7000.0
+</constant>
+        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
+         1.0
+         1.0
+         1.0
+         1.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
+         -20.0
+         0.0
+         40.0
+         80.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
+         0.0
+         0.71
+         1.43
+         2.14
+         2.86
+         3.57
+         4.29
+         5.0
+</constant>
+        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         14.0
+         15.0
+</constant>
+        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.19.XXX.4275859823" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.22.XXX.4019883890" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_MAZDA_MIATA_NB2.msq b/generated/simulator_tune_MAZDA_MIATA_NB2.msq
index cdf0565..8b1d130 100644
--- a/generated/simulator_tune_MAZDA_MIATA_NB2.msq
+++ b/generated/simulator_tune_MAZDA_MIATA_NB2.msq
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <msq xmlns="http://www.msefi.com/:msq">
     <page/>
-    <page number="0" size="22428">
+    <page number="0" size="22400">
         <constant name="engineType">"MAZDA_MIATA_NB2"</constant>
         <constant digits="0" name="startButtonSuppressOnStartUpMs" units="">0.0</constant>
         <constant digits="0" name="sensorSnifferRpmThreshold" units="RPM">2500.0</constant>
@@ -12,26 +12,25 @@
         <constant digits="0" name="maxAcRpm" units="rpm">5000.0</constant>
         <constant digits="0" name="maxAcTps" units="%">75.0</constant>
         <constant digits="0" name="maxAcClt" units="deg C">100.0</constant>
-        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
-         650.0
-         800.0
-         1100.0
-         1400.0
-         1700.0
-         2000.0
-         2300.0
-         2600.0
-         2900.0
-         3200.0
-         3500.0
-         3800.0
-         4100.0
-         4400.0
-         4700.0
-         7000.0
-</constant>
+        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
+        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
+        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
+        <constant name="mainRelayPin">"NONE"</constant>
+        <constant name="sdCardCsPin">"NONE"</constant>
+        <constant name="canTxPin">"NONE"</constant>
+        <constant name="canRxPin">"NONE"</constant>
+        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
+        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
+        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
+        <constant name="tachOutputPin">"NONE"</constant>
+        <constant name="tachOutputPinMode">"default"</constant>
+        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
+        <constant digits="0" name="manIdlePosition" units="%">20.0</constant>
         <constant digits="0" name="multisparkMaxSparkingAngle" units="deg">30.0</constant>
         <constant digits="0" name="multisparkMaxExtraSparkCount" units="count">2.0</constant>
+        <constant digits="0" name="vvtControlMinRpm" units="RPM">500.0</constant>
         <constant digits="2" name="injector_flow" units="cm3/min">265.0</constant>
         <constant cols="1" digits="2" name="injector_battLagCorrBins" rows="8">
          6.0
@@ -182,6 +181,7 @@
         <constant digits="0" name="triggerSimulatorRpm" units="RPM">1200.0</constant>
         <constant digits="0" name="cylindersCount" units="">4.0</constant>
         <constant name="firingOrder">"1-3-4-2"</constant>
+        <constant digits="0" name="justATempTest" units="">0.0</constant>
         <constant name="communityCommsLedPid">"NONE"</constant>
         <constant digits="2" name="cylinderBore" units="mm">83.0</constant>
         <constant name="fuelAlgorithm">"Speed Density"</constant>
@@ -195,8 +195,10 @@
         <constant name="ignitionMode">"Wasted Spark"</constant>
         <constant digits="0" name="gapTrackingLengthOverride" units="count">0.0</constant>
         <constant digits="0" name="maxIdleVss" units="kph">0.0</constant>
+        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
         <constant digits="0" name="minOilPressureAfterStart" units="kPa">0.0</constant>
         <constant name="timingMode">"dynamic"</constant>
+        <constant name="canNbcType">"None"</constant>
         <constant digits="0" name="fixedModeTiming" units="RPM">50.0</constant>
         <constant digits="0" name="globalTriggerAngleOffset" units="deg btdc">0.0</constant>
         <constant digits="2" name="analogInputDividerCoefficient" units="coef">2.0</constant>
@@ -205,12 +207,7 @@
         <constant digits="0" name="fanOffTemperature" units="deg C">88.0</constant>
         <constant name="acrPin">"NONE"</constant>
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">538.0</constant>
-        <constant name="canNbcType">"None"</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
-        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
-        <constant digits="0" name="justATempTest" units="">0.0</constant>
-        <constant digits="0" name="unusedHere333" units="">0.0</constant>
-        <constant digits="0" name="unusedHere334" units="">0.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
         <constant name="tps1_1AdcChannel">"Disabled"</constant>
         <constant name="vbattAdcChannel">"Disabled"</constant>
@@ -226,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.0240319E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240322E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"NONE"</constant>
@@ -254,12 +251,12 @@
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
         <constant name="idle_stepperStepPin">"NONE"</constant>
         <constant name="idle_solenoidPinMode">"default"</constant>
-        <constant digits="0" name="manIdlePosition" units="%">20.0</constant>
         <constant digits="1" name="knockRetardAggression" units="%">20.0</constant>
         <constant digits="1" name="knockRetardReapplyRate" units="deg/s">3.0</constant>
         <constant name="engineSyncCam">"Intake First Bank"</constant>
-        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
+        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="3" name="vssGearRatio" units="ratio">1.117</constant>
+        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
         <constant digits="0" name="vssToothCount" units="count">4.0</constant>
         <constant name="idleVeOverrideMode">"None"</constant>
         <constant name="l9779_cs">"NONE"</constant>
@@ -308,22 +305,13 @@
         <constant name="max31855spiDevice">"Off"</constant>
         <constant name="debugTriggerSync">"NONE"</constant>
         <constant name="digitalPotentiometerSpiDevice">"Off"</constant>
+        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
         <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
         <constant name="tps1_2AdcChannel">"Disabled"</constant>
         <constant name="tps2_2AdcChannel">"Disabled"</constant>
         <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
-        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.03</constant>
@@ -331,23 +319,10 @@
         <constant name="triggerInputPins2">"NONE"</constant>
         <constant digits="0" name="mc33_t_min_boost" units="us">100.0</constant>
         <constant name="hip9011CsPinMode">"default"</constant>
-        <constant name="tachOutputPin">"NONE"</constant>
-        <constant name="tachOutputPinMode">"default"</constant>
-        <constant name="mainRelayPin">"NONE"</constant>
-        <constant name="sdCardCsPin">"NONE"</constant>
-        <constant name="canTxPin">"NONE"</constant>
-        <constant name="canRxPin">"NONE"</constant>
         <constant name="throttlePedalUpPinMode">"DEFAULT"</constant>
-        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
         <constant digits="2" name="finalGearRatio" units="ratio">3.91</constant>
         <constant name="tcuInputSpeedSensorPin">"NONE"</constant>
         <constant digits="0" name="tcuInputSpeedSensorTeeth" units="">1.0</constant>
-        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
-        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
         <constant name="triggerSimulatorPins1">"NONE"</constant>
         <constant name="triggerSimulatorPins2">"NONE"</constant>
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
@@ -403,27 +378,7 @@
         <constant name="acFanPin">"NONE"</constant>
         <constant name="acFanPinMode">"default"</constant>
         <constant name="l9779spiDevice">"Off"</constant>
-        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         14.0
-         15.0
-</constant>
         <constant name="imuType">"None"</constant>
-        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="vehicleWeight" units="kg">1070.0</constant>
         <constant digits="0" name="idlePidRpmUpperLimit" units="RPM">350.0</constant>
         <constant digits="3" name="applyNonlinearBelowPulse" units="ms">0.0</constant>
@@ -454,6 +409,8 @@
         <constant name="starterRelayDisablePinMode">"default"</constant>
         <constant name="secondSolenoidPin">"NONE"</constant>
         <constant name="startStopButtonPin">"NONE"</constant>
+        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
+        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="0" name="mapMinBufferLength" units="count">1.0</constant>
         <constant digits="0" name="idlePidDeactivationTpsThreshold" units="%">5.0</constant>
         <constant digits="0" name="stepperParkingExtraSteps" units="%">0.0</constant>
@@ -466,8 +423,6 @@
         <constant name="acRelayPin">"NONE"</constant>
         <constant digits="0" name="lambdaProtectionMinTps" units="%">50.0</constant>
         <constant digits="1" name="lambdaProtectionTimeout" units="s">0.5</constant>
-        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
-        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="2" name="scriptSetting1" units="">0.0</constant>
         <constant digits="2" name="scriptSetting2" units="">0.0</constant>
         <constant digits="2" name="scriptSetting3" units="">0.0</constant>
@@ -546,6 +501,8 @@
         <constant digits="0" name="boostPwmFrequency" units="Hz">33.0</constant>
         <constant name="launchActivationMode">"Launch Button"</constant>
         <constant name="antiLagActivationMode">"Switch Input"</constant>
+        <constant digits="2" name="tpsAccelLookback" units="sec">0.0</constant>
+        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="0" name="launchSpeedThreshold" units="Kph">30.0</constant>
         <constant digits="0" name="launchRpmWindow" units="RPM">500.0</constant>
         <constant digits="0" name="launchSparkSkipPercent" units="%">0.0</constant>
@@ -597,16 +554,6 @@
         <constant name="drv8860_cs">"NONE"</constant>
         <constant name="drv8860_csPinMode">"default"</constant>
         <constant name="drv8860_miso">"NONE"</constant>
-        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
-         0.0
-         0.71
-         1.43
-         2.14
-         2.86
-         3.57
-         4.29
-         5.0
-</constant>
         <constant name="luaOutputPins1">"NONE"</constant>
         <constant name="luaOutputPins2">"NONE"</constant>
         <constant name="luaOutputPins3">"NONE"</constant>
@@ -812,10 +759,8 @@
         <constant name="auxSerialTxPin">"NONE"</constant>
         <constant name="auxSerialRxPin">"NONE"</constant>
         <constant name="accelerometerCsPin">"NONE"</constant>
-        <constant digits="2" name="tpsAccelLookback" units="sec">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssLow" units="kph">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssHigh" units="kph">0.0</constant>
-        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="1" name="tpsAccelEnrichmentThreshold" units="roc">40.0</constant>
         <constant name="auxSpeedSensorInputPin1">"NONE"</constant>
         <constant name="auxSpeedSensorInputPin2">"NONE"</constant>
@@ -904,7 +849,6 @@
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
-        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="0" name="crankingIACposition" units="percent">60.0</constant>
         <constant digits="4" name="tChargeMinRpmMinTps" units="">0.25</constant>
         <constant digits="4" name="tChargeMinRpmMaxTps" units="">0.25</constant>
@@ -1022,7 +966,6 @@
         <constant name="mc33816_rstb">"NONE"</constant>
         <constant name="mc33816_driven">"NONE"</constant>
         <constant name="brakePedalPin">"NONE"</constant>
-        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant digits="4" name="auxPid1_pFactor" units="">2.0</constant>
         <constant digits="4" name="auxPid1_iFactor" units="">0.005</constant>
         <constant digits="4" name="auxPid1_dFactor" units="">0.002</constant>
@@ -1069,12 +1012,7 @@
         <constant name="tle8888_csPinMode">"default"</constant>
         <constant name="mc33816_cs">"NONE"</constant>
         <constant digits="1" name="auxFrequencyFilter" units="hz">0.0</constant>
-        <constant digits="0" name="vvtControlMinRpm" units="RPM">500.0</constant>
         <constant name="sentInputPins1">"NONE"</constant>
-        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
-        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
-        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
-        <constant digits="0" name="unused645646" units="">0.0</constant>
         <constant digits="0" name="coastingFuelCutRpmHigh" units="rpm">1500.0</constant>
         <constant digits="0" name="coastingFuelCutRpmLow" units="rpm">1300.0</constant>
         <constant digits="0" name="coastingFuelCutTps" units="%">2.0</constant>
@@ -1091,24 +1029,11 @@
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value2" units="">0.0</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
-         -20.0
-         0.0
-         40.0
-         80.0
-</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant digits="3" name="tChargeAirCoefMin" units="">0.098</constant>
         <constant digits="3" name="tChargeAirCoefMax" units="">0.902</constant>
         <constant digits="1" name="tChargeAirFlowMax" units="kg/h">153.6</constant>
         <constant digits="1" name="tChargeAirIncrLimit" units="deg/sec">1.0</constant>
         <constant digits="1" name="tChargeAirDecrLimit" units="deg/sec">12.5</constant>
-        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="2" name="hip9011Gain" units="">1.0</constant>
         <constant digits="0" name="etb_iTermMin" units="">-30.0</constant>
         <constant digits="0" name="etb_iTermMax" units="">30.0</constant>
@@ -1130,10 +1055,10 @@
         <constant digits="1" name="stoichRatioPrimary" units=":1">14.7</constant>
         <constant digits="0" name="idlerpmpid_iTermMax" units="">30.0</constant>
         <constant digits="0" name="etbIdleThrottleRange" units="%">15.0</constant>
-        <constant digits="0" name="cylinderBankSelect1" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect2" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect3" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect4" units="">0.0</constant>
+        <constant digits="0" name="cylinderBankSelect1" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect2" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect3" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect4" units="">1.0</constant>
         <constant digits="0" name="cylinderBankSelect5" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect6" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect7" units="">0.0</constant>
@@ -1341,24 +1266,6 @@
         <constant name="tcu_solenoid_mode4">"default"</constant>
         <constant name="tcu_solenoid_mode5">"default"</constant>
         <constant name="tcu_solenoid_mode6">"default"</constant>
-        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-</constant>
         <constant digits="3" name="triggerGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom2" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom3" units="ratio">0.0</constant>
@@ -1398,13 +1305,8 @@
         <constant digits="0" name="maxCamPhaseResolveRpm" units="rpm">0.0</constant>
         <constant digits="1" name="dfcoDelay" units="sec">0.0</constant>
         <constant digits="1" name="acDelay" units="sec">0.5</constant>
+        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="3" name="fordInjectorSmallPulseBreakPoint" units="mg">0.0</constant>
-        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="etbJamIntegratorLimit" units="%">0.0</constant>
         <constant digits="0" name="hpfpCamLobes" units="lobes/cam">3.0</constant>
         <constant name="hpfpCam">"NONE"</constant>
@@ -1416,134 +1318,6 @@
         <constant digits="3" name="hpfpPidP" units="%/kPa">0.01</constant>
         <constant digits="5" name="hpfpPidI" units="%/kPa/lobe">3.0E-4</constant>
         <constant digits="0" name="hpfpTargetDecay" units="kPa/s">2000.0</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
-         0.0
-         1.0
-         4.5
-         9.5
-         16.5
-         25.0
-         34.5
-         45.0
-         55.0
-         65.5
-         75.0
-         83.5
-         90.5
-         95.5
-         99.0
-         100.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
-         0.0
-         7.5
-         16.5
-         24.0
-         32.0
-         40.0
-         48.0
-         56.0
-         64.0
-         72.0
-         80.0
-         88.0
-         96.0
-         103.5
-         112.5
-         120.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         15.0
-         16.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-         120.0
-         140.0
-         160.0
-         180.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
-         0.005
-         0.018
-         0.031
-         0.043
-         0.056
-         0.069
-         0.082
-         0.094
-         0.107
-         0.12
-</constant>
-        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
         <constant name="stepper_raw_output1">"NONE"</constant>
         <constant name="stepper_raw_output2">"NONE"</constant>
         <constant name="stepper_raw_output3">"NONE"</constant>
@@ -1559,66 +1333,6 @@
         <constant digits="2" name="gearRatio9" units="ratio">0.0</constant>
         <constant digits="2" name="gearRatio10" units="ratio">0.0</constant>
         <constant digits="0" name="vvtActivationDelayMs" units="ms">6000.0</constant>
-        <constant cols="1" digits="0" name="wwCltBins" rows="8">
-         -40.0
-         -20.0
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
-         1.45
-         1.3
-         1.17
-         1.05
-         0.9
-         0.82
-         0.75
-         0.7
-</constant>
-        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
-         0.73
-         0.66
-         0.57
-         0.46
-         0.38
-         0.31
-         0.24
-         0.19
-</constant>
-        <constant cols="1" digits="0" name="wwMapBins" rows="8">
-         10.0
-         20.0
-         30.0
-         40.0
-         50.0
-         60.0
-         70.0
-         80.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
-         0.38
-         0.55
-         0.69
-         0.86
-         0.9
-         0.95
-         0.97
-         1.0
-</constant>
-        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
-         0.21
-         0.4
-         0.6
-         0.79
-         0.85
-         0.9
-         0.95
-         1.0
-</constant>
         <constant cols="6" digits="0" name="torqueTable" rows="6">
          0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0
@@ -1704,7 +1418,6 @@
          0.0
          0.0
 </constant>
-        <constant digits="0" name="unused3124141" units="">0.0</constant>
         <constant name="fuelPressureSensorMode">"Absolute"</constant>
         <constant name="luaDigitalInputPins1">"NONE"</constant>
         <constant name="luaDigitalInputPins2">"NONE"</constant>
@@ -1714,12 +1427,6 @@
         <constant name="luaDigitalInputPins6">"NONE"</constant>
         <constant name="luaDigitalInputPins7">"NONE"</constant>
         <constant name="luaDigitalInputPins8">"NONE"</constant>
-        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
-         650.0
-         800.0
-         3750.0
-         7000.0
-</constant>
         <constant digits="0" name="ALSMinRPM" units="rpm">400.0</constant>
         <constant digits="0" name="ALSMaxRPM" units="rpm">3200.0</constant>
         <constant digits="0" name="ALSMaxDuration" units="sec">3.0</constant>
@@ -1895,7 +1602,124 @@
         <constant name="spi5MisoMode">"default"</constant>
         <constant name="spi6SckMode">"default"</constant>
         <constant name="spi6MosiMode">"default"</constant>
-        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="120">
+        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
+        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="236">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
          0.0
          0.0
          0.0
@@ -2381,40 +2205,22 @@
          40.0
          40.0
 </constant>
-        <constant cols="1" digits="0" name="unusedGapInCalibration" rows="32">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
+        <constant digits="0" name="fancyOptions1" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions2" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions3" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions4" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions5" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions6" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions7" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions8" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions9" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions10" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions11" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions12" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions13" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions14" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions15" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions16" units="">0.0</constant>
         <constant cols="8" digits="1" name="boostTableOpenLoop" rows="8">
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
@@ -4555,9 +4361,297 @@ end</constant>
          3600.0
          5000.0
          7000.0
+</constant>
+        <constant cols="1" digits="0" name="wwCltBins" rows="8">
+         -40.0
+         -20.0
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
+         1.45
+         1.3
+         1.17
+         1.05
+         0.9
+         0.82
+         0.75
+         0.7
+</constant>
+        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
+         0.73
+         0.66
+         0.57
+         0.46
+         0.38
+         0.31
+         0.24
+         0.19
+</constant>
+        <constant cols="1" digits="0" name="wwMapBins" rows="8">
+         10.0
+         20.0
+         30.0
+         40.0
+         50.0
+         60.0
+         70.0
+         80.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
+         0.38
+         0.55
+         0.69
+         0.86
+         0.9
+         0.95
+         0.97
+         1.0
+</constant>
+        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
+         0.21
+         0.4
+         0.6
+         0.79
+         0.85
+         0.9
+         0.95
+         1.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
+         0.0
+         1.0
+         4.5
+         9.5
+         16.5
+         25.0
+         34.5
+         45.0
+         55.0
+         65.5
+         75.0
+         83.5
+         90.5
+         95.5
+         99.0
+         100.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
+         0.0
+         7.5
+         16.5
+         24.0
+         32.0
+         40.0
+         48.0
+         56.0
+         64.0
+         72.0
+         80.0
+         88.0
+         96.0
+         103.5
+         112.5
+         120.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         15.0
+         16.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+         120.0
+         140.0
+         160.0
+         180.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
+         0.005
+         0.018
+         0.031
+         0.043
+         0.056
+         0.069
+         0.082
+         0.094
+         0.107
+         0.12
+</constant>
+        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
+         650.0
+         800.0
+         1100.0
+         1400.0
+         1700.0
+         2000.0
+         2300.0
+         2600.0
+         2900.0
+         3200.0
+         3500.0
+         3800.0
+         4100.0
+         4400.0
+         4700.0
+         7000.0
+</constant>
+        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+</constant>
+        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
+         650.0
+         800.0
+         3750.0
+         7000.0
+</constant>
+        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
+         1.0
+         1.0
+         1.0
+         1.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
+         -20.0
+         0.0
+         40.0
+         80.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
+         0.0
+         0.71
+         1.43
+         2.14
+         2.86
+         3.57
+         4.29
+         5.0
+</constant>
+        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         14.0
+         15.0
+</constant>
+        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.19.XXX.4275859823" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.22.XXX.4019883890" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_MERCEDES_M111.msq b/generated/simulator_tune_MERCEDES_M111.msq
index dda1f40..9e539ed 100644
--- a/generated/simulator_tune_MERCEDES_M111.msq
+++ b/generated/simulator_tune_MERCEDES_M111.msq
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <msq xmlns="http://www.msefi.com/:msq">
     <page/>
-    <page number="0" size="22428">
+    <page number="0" size="22400">
         <constant name="engineType">"MERCEDES_M111"</constant>
         <constant digits="0" name="startButtonSuppressOnStartUpMs" units="">0.0</constant>
         <constant digits="0" name="sensorSnifferRpmThreshold" units="RPM">2500.0</constant>
@@ -12,26 +12,25 @@
         <constant digits="0" name="maxAcRpm" units="rpm">5000.0</constant>
         <constant digits="0" name="maxAcTps" units="%">75.0</constant>
         <constant digits="0" name="maxAcClt" units="deg C">100.0</constant>
-        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
-         650.0
-         800.0
-         1100.0
-         1400.0
-         1700.0
-         2000.0
-         2300.0
-         2600.0
-         2900.0
-         3200.0
-         3500.0
-         3800.0
-         4100.0
-         4400.0
-         4700.0
-         7000.0
-</constant>
+        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
+        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
+        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
+        <constant name="mainRelayPin">"NONE"</constant>
+        <constant name="sdCardCsPin">"NONE"</constant>
+        <constant name="canTxPin">"NONE"</constant>
+        <constant name="canRxPin">"NONE"</constant>
+        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
+        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
+        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
+        <constant name="tachOutputPin">"NONE"</constant>
+        <constant name="tachOutputPinMode">"default"</constant>
+        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
+        <constant digits="0" name="manIdlePosition" units="%">50.0</constant>
         <constant digits="0" name="multisparkMaxSparkingAngle" units="deg">30.0</constant>
         <constant digits="0" name="multisparkMaxExtraSparkCount" units="count">2.0</constant>
+        <constant digits="0" name="vvtControlMinRpm" units="RPM">500.0</constant>
         <constant digits="2" name="injector_flow" units="cm3/min">196.0</constant>
         <constant cols="1" digits="2" name="injector_battLagCorrBins" rows="8">
          6.0
@@ -182,6 +181,7 @@
         <constant digits="0" name="triggerSimulatorRpm" units="RPM">1200.0</constant>
         <constant digits="0" name="cylindersCount" units="">4.0</constant>
         <constant name="firingOrder">"1-3-4-2"</constant>
+        <constant digits="0" name="justATempTest" units="">0.0</constant>
         <constant name="communityCommsLedPid">"NONE"</constant>
         <constant digits="2" name="cylinderBore" units="mm">89.9</constant>
         <constant name="fuelAlgorithm">"Speed Density"</constant>
@@ -195,8 +195,10 @@
         <constant name="ignitionMode">"Individual Coils"</constant>
         <constant digits="0" name="gapTrackingLengthOverride" units="count">0.0</constant>
         <constant digits="0" name="maxIdleVss" units="kph">0.0</constant>
+        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
         <constant digits="0" name="minOilPressureAfterStart" units="kPa">0.0</constant>
         <constant name="timingMode">"dynamic"</constant>
+        <constant name="canNbcType">"W202"</constant>
         <constant digits="0" name="fixedModeTiming" units="RPM">50.0</constant>
         <constant digits="0" name="globalTriggerAngleOffset" units="deg btdc">469.0</constant>
         <constant digits="2" name="analogInputDividerCoefficient" units="coef">2.0</constant>
@@ -205,12 +207,7 @@
         <constant digits="0" name="fanOffTemperature" units="deg C">88.0</constant>
         <constant name="acrPin">"NONE"</constant>
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">1000.0</constant>
-        <constant name="canNbcType">"W202"</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
-        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
-        <constant digits="0" name="justATempTest" units="">0.0</constant>
-        <constant digits="0" name="unusedHere333" units="">0.0</constant>
-        <constant digits="0" name="unusedHere334" units="">0.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
         <constant name="tps1_1AdcChannel">"PC3"</constant>
         <constant name="vbattAdcChannel">"Disabled"</constant>
@@ -226,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.0240319E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240322E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"PE11"</constant>
@@ -254,12 +251,12 @@
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
         <constant name="idle_stepperStepPin">"NONE"</constant>
         <constant name="idle_solenoidPinMode">"default"</constant>
-        <constant digits="0" name="manIdlePosition" units="%">50.0</constant>
         <constant digits="1" name="knockRetardAggression" units="%">20.0</constant>
         <constant digits="1" name="knockRetardReapplyRate" units="deg/s">3.0</constant>
         <constant name="engineSyncCam">"Intake First Bank"</constant>
-        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
+        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="3" name="vssGearRatio" units="ratio">3.73</constant>
+        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
         <constant digits="0" name="vssToothCount" units="count">21.0</constant>
         <constant name="idleVeOverrideMode">"None"</constant>
         <constant name="l9779_cs">"NONE"</constant>
@@ -308,22 +305,13 @@
         <constant name="max31855spiDevice">"Off"</constant>
         <constant name="debugTriggerSync">"NONE"</constant>
         <constant name="digitalPotentiometerSpiDevice">"Off"</constant>
+        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
         <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
         <constant name="tps1_2AdcChannel">"PA6"</constant>
         <constant name="tps2_2AdcChannel">"Disabled"</constant>
         <constant name="throttlePedalPositionSecondAdcChannel">"PC5"</constant>
-        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -331,23 +319,10 @@
         <constant name="triggerInputPins2">"NONE"</constant>
         <constant digits="0" name="mc33_t_min_boost" units="us">100.0</constant>
         <constant name="hip9011CsPinMode">"default"</constant>
-        <constant name="tachOutputPin">"NONE"</constant>
-        <constant name="tachOutputPinMode">"default"</constant>
-        <constant name="mainRelayPin">"NONE"</constant>
-        <constant name="sdCardCsPin">"NONE"</constant>
-        <constant name="canTxPin">"NONE"</constant>
-        <constant name="canRxPin">"NONE"</constant>
         <constant name="throttlePedalUpPinMode">"DEFAULT"</constant>
-        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
         <constant digits="2" name="finalGearRatio" units="ratio">1.0</constant>
         <constant name="tcuInputSpeedSensorPin">"NONE"</constant>
         <constant digits="0" name="tcuInputSpeedSensorTeeth" units="">1.0</constant>
-        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
-        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
         <constant name="triggerSimulatorPins1">"NONE"</constant>
         <constant name="triggerSimulatorPins2">"NONE"</constant>
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
@@ -403,27 +378,7 @@
         <constant name="acFanPin">"NONE"</constant>
         <constant name="acFanPinMode">"default"</constant>
         <constant name="l9779spiDevice">"Off"</constant>
-        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         14.0
-         15.0
-</constant>
         <constant name="imuType">"None"</constant>
-        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="vehicleWeight" units="kg">1250.0</constant>
         <constant digits="0" name="idlePidRpmUpperLimit" units="RPM">300.0</constant>
         <constant digits="3" name="applyNonlinearBelowPulse" units="ms">0.0</constant>
@@ -454,6 +409,8 @@
         <constant name="starterRelayDisablePinMode">"default"</constant>
         <constant name="secondSolenoidPin">"NONE"</constant>
         <constant name="startStopButtonPin">"NONE"</constant>
+        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
+        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="0" name="mapMinBufferLength" units="count">1.0</constant>
         <constant digits="0" name="idlePidDeactivationTpsThreshold" units="%">5.0</constant>
         <constant digits="0" name="stepperParkingExtraSteps" units="%">0.0</constant>
@@ -466,8 +423,6 @@
         <constant name="acRelayPin">"NONE"</constant>
         <constant digits="0" name="lambdaProtectionMinTps" units="%">50.0</constant>
         <constant digits="1" name="lambdaProtectionTimeout" units="s">0.5</constant>
-        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
-        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="2" name="scriptSetting1" units="">0.0</constant>
         <constant digits="2" name="scriptSetting2" units="">0.0</constant>
         <constant digits="2" name="scriptSetting3" units="">0.0</constant>
@@ -546,6 +501,8 @@
         <constant digits="0" name="boostPwmFrequency" units="Hz">33.0</constant>
         <constant name="launchActivationMode">"Launch Button"</constant>
         <constant name="antiLagActivationMode">"Switch Input"</constant>
+        <constant digits="2" name="tpsAccelLookback" units="sec">0.0</constant>
+        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="0" name="launchSpeedThreshold" units="Kph">30.0</constant>
         <constant digits="0" name="launchRpmWindow" units="RPM">500.0</constant>
         <constant digits="0" name="launchSparkSkipPercent" units="%">0.0</constant>
@@ -596,16 +553,6 @@
         <constant name="drv8860_cs">"NONE"</constant>
         <constant name="drv8860_csPinMode">"default"</constant>
         <constant name="drv8860_miso">"NONE"</constant>
-        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
-         0.0
-         0.71
-         1.43
-         2.14
-         2.86
-         3.57
-         4.29
-         5.0
-</constant>
         <constant name="luaOutputPins1">"NONE"</constant>
         <constant name="luaOutputPins2">"NONE"</constant>
         <constant name="luaOutputPins3">"NONE"</constant>
@@ -811,10 +758,8 @@
         <constant name="auxSerialTxPin">"NONE"</constant>
         <constant name="auxSerialRxPin">"NONE"</constant>
         <constant name="accelerometerCsPin">"NONE"</constant>
-        <constant digits="2" name="tpsAccelLookback" units="sec">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssLow" units="kph">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssHigh" units="kph">0.0</constant>
-        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="1" name="tpsAccelEnrichmentThreshold" units="roc">40.0</constant>
         <constant name="auxSpeedSensorInputPin1">"NONE"</constant>
         <constant name="auxSpeedSensorInputPin2">"NONE"</constant>
@@ -903,7 +848,6 @@
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
-        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="0" name="crankingIACposition" units="percent">50.0</constant>
         <constant digits="4" name="tChargeMinRpmMinTps" units="">0.25</constant>
         <constant digits="4" name="tChargeMinRpmMaxTps" units="">0.25</constant>
@@ -1021,7 +965,6 @@
         <constant name="mc33816_rstb">"NONE"</constant>
         <constant name="mc33816_driven">"NONE"</constant>
         <constant name="brakePedalPin">"NONE"</constant>
-        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant digits="4" name="auxPid1_pFactor" units="">2.0</constant>
         <constant digits="4" name="auxPid1_iFactor" units="">0.005</constant>
         <constant digits="4" name="auxPid1_dFactor" units="">0.0</constant>
@@ -1068,12 +1011,7 @@
         <constant name="tle8888_csPinMode">"default"</constant>
         <constant name="mc33816_cs">"NONE"</constant>
         <constant digits="1" name="auxFrequencyFilter" units="hz">0.0</constant>
-        <constant digits="0" name="vvtControlMinRpm" units="RPM">500.0</constant>
         <constant name="sentInputPins1">"NONE"</constant>
-        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
-        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
-        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
-        <constant digits="0" name="unused645646" units="">0.0</constant>
         <constant digits="0" name="coastingFuelCutRpmHigh" units="rpm">1500.0</constant>
         <constant digits="0" name="coastingFuelCutRpmLow" units="rpm">1300.0</constant>
         <constant digits="0" name="coastingFuelCutTps" units="%">2.0</constant>
@@ -1090,24 +1028,11 @@
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value2" units="">0.0</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
-         -20.0
-         0.0
-         40.0
-         80.0
-</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant digits="3" name="tChargeAirCoefMin" units="">0.098</constant>
         <constant digits="3" name="tChargeAirCoefMax" units="">0.902</constant>
         <constant digits="1" name="tChargeAirFlowMax" units="kg/h">153.6</constant>
         <constant digits="1" name="tChargeAirIncrLimit" units="deg/sec">1.0</constant>
         <constant digits="1" name="tChargeAirDecrLimit" units="deg/sec">12.5</constant>
-        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="2" name="hip9011Gain" units="">1.0</constant>
         <constant digits="0" name="etb_iTermMin" units="">-30.0</constant>
         <constant digits="0" name="etb_iTermMax" units="">30.0</constant>
@@ -1129,10 +1054,10 @@
         <constant digits="1" name="stoichRatioPrimary" units=":1">14.7</constant>
         <constant digits="0" name="idlerpmpid_iTermMax" units="">20.0</constant>
         <constant digits="0" name="etbIdleThrottleRange" units="%">15.0</constant>
-        <constant digits="0" name="cylinderBankSelect1" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect2" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect3" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect4" units="">0.0</constant>
+        <constant digits="0" name="cylinderBankSelect1" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect2" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect3" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect4" units="">1.0</constant>
         <constant digits="0" name="cylinderBankSelect5" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect6" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect7" units="">0.0</constant>
@@ -1340,24 +1265,6 @@
         <constant name="tcu_solenoid_mode4">"default"</constant>
         <constant name="tcu_solenoid_mode5">"default"</constant>
         <constant name="tcu_solenoid_mode6">"default"</constant>
-        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-</constant>
         <constant digits="3" name="triggerGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom2" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom3" units="ratio">0.0</constant>
@@ -1397,13 +1304,8 @@
         <constant digits="0" name="maxCamPhaseResolveRpm" units="rpm">0.0</constant>
         <constant digits="1" name="dfcoDelay" units="sec">0.0</constant>
         <constant digits="1" name="acDelay" units="sec">0.5</constant>
+        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="3" name="fordInjectorSmallPulseBreakPoint" units="mg">0.0</constant>
-        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="etbJamIntegratorLimit" units="%">0.0</constant>
         <constant digits="0" name="hpfpCamLobes" units="lobes/cam">3.0</constant>
         <constant name="hpfpCam">"NONE"</constant>
@@ -1415,134 +1317,6 @@
         <constant digits="3" name="hpfpPidP" units="%/kPa">0.01</constant>
         <constant digits="5" name="hpfpPidI" units="%/kPa/lobe">3.0E-4</constant>
         <constant digits="0" name="hpfpTargetDecay" units="kPa/s">2000.0</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
-         0.0
-         1.0
-         4.5
-         9.5
-         16.5
-         25.0
-         34.5
-         45.0
-         55.0
-         65.5
-         75.0
-         83.5
-         90.5
-         95.5
-         99.0
-         100.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
-         0.0
-         7.5
-         16.5
-         24.0
-         32.0
-         40.0
-         48.0
-         56.0
-         64.0
-         72.0
-         80.0
-         88.0
-         96.0
-         103.5
-         112.5
-         120.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         15.0
-         16.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-         120.0
-         140.0
-         160.0
-         180.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
-         0.005
-         0.018
-         0.031
-         0.043
-         0.056
-         0.069
-         0.082
-         0.094
-         0.107
-         0.12
-</constant>
-        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
         <constant name="stepper_raw_output1">"NONE"</constant>
         <constant name="stepper_raw_output2">"NONE"</constant>
         <constant name="stepper_raw_output3">"NONE"</constant>
@@ -1558,66 +1332,6 @@
         <constant digits="2" name="gearRatio9" units="ratio">0.0</constant>
         <constant digits="2" name="gearRatio10" units="ratio">0.0</constant>
         <constant digits="0" name="vvtActivationDelayMs" units="ms">6000.0</constant>
-        <constant cols="1" digits="0" name="wwCltBins" rows="8">
-         -40.0
-         -20.0
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
-         1.45
-         1.3
-         1.17
-         1.05
-         0.9
-         0.82
-         0.75
-         0.7
-</constant>
-        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
-         0.73
-         0.66
-         0.57
-         0.46
-         0.38
-         0.31
-         0.24
-         0.19
-</constant>
-        <constant cols="1" digits="0" name="wwMapBins" rows="8">
-         10.0
-         20.0
-         30.0
-         40.0
-         50.0
-         60.0
-         70.0
-         80.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
-         0.38
-         0.55
-         0.69
-         0.86
-         0.9
-         0.95
-         0.97
-         1.0
-</constant>
-        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
-         0.21
-         0.4
-         0.6
-         0.79
-         0.85
-         0.9
-         0.95
-         1.0
-</constant>
         <constant cols="6" digits="0" name="torqueTable" rows="6">
          0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0
@@ -1703,7 +1417,6 @@
          0.0
          0.0
 </constant>
-        <constant digits="0" name="unused3124141" units="">0.0</constant>
         <constant name="fuelPressureSensorMode">"Absolute"</constant>
         <constant name="luaDigitalInputPins1">"NONE"</constant>
         <constant name="luaDigitalInputPins2">"NONE"</constant>
@@ -1713,12 +1426,6 @@
         <constant name="luaDigitalInputPins6">"NONE"</constant>
         <constant name="luaDigitalInputPins7">"NONE"</constant>
         <constant name="luaDigitalInputPins8">"NONE"</constant>
-        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
-         650.0
-         800.0
-         3750.0
-         7000.0
-</constant>
         <constant digits="0" name="ALSMinRPM" units="rpm">400.0</constant>
         <constant digits="0" name="ALSMaxRPM" units="rpm">3200.0</constant>
         <constant digits="0" name="ALSMaxDuration" units="sec">3.0</constant>
@@ -1894,7 +1601,124 @@
         <constant name="spi5MisoMode">"default"</constant>
         <constant name="spi6SckMode">"default"</constant>
         <constant name="spi6MosiMode">"default"</constant>
-        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="120">
+        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
+        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="236">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
          0.0
          0.0
          0.0
@@ -2380,40 +2204,22 @@
          0.0
          0.0
 </constant>
-        <constant cols="1" digits="0" name="unusedGapInCalibration" rows="32">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
+        <constant digits="0" name="fancyOptions1" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions2" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions3" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions4" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions5" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions6" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions7" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions8" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions9" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions10" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions11" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions12" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions13" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions14" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions15" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions16" units="">0.0</constant>
         <constant cols="8" digits="1" name="boostTableOpenLoop" rows="8">
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
@@ -4554,9 +4360,297 @@ end</constant>
          3600.0
          5000.0
          7000.0
+</constant>
+        <constant cols="1" digits="0" name="wwCltBins" rows="8">
+         -40.0
+         -20.0
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
+         1.45
+         1.3
+         1.17
+         1.05
+         0.9
+         0.82
+         0.75
+         0.7
+</constant>
+        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
+         0.73
+         0.66
+         0.57
+         0.46
+         0.38
+         0.31
+         0.24
+         0.19
+</constant>
+        <constant cols="1" digits="0" name="wwMapBins" rows="8">
+         10.0
+         20.0
+         30.0
+         40.0
+         50.0
+         60.0
+         70.0
+         80.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
+         0.38
+         0.55
+         0.69
+         0.86
+         0.9
+         0.95
+         0.97
+         1.0
+</constant>
+        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
+         0.21
+         0.4
+         0.6
+         0.79
+         0.85
+         0.9
+         0.95
+         1.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
+         0.0
+         1.0
+         4.5
+         9.5
+         16.5
+         25.0
+         34.5
+         45.0
+         55.0
+         65.5
+         75.0
+         83.5
+         90.5
+         95.5
+         99.0
+         100.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
+         0.0
+         7.5
+         16.5
+         24.0
+         32.0
+         40.0
+         48.0
+         56.0
+         64.0
+         72.0
+         80.0
+         88.0
+         96.0
+         103.5
+         112.5
+         120.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         15.0
+         16.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+         120.0
+         140.0
+         160.0
+         180.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
+         0.005
+         0.018
+         0.031
+         0.043
+         0.056
+         0.069
+         0.082
+         0.094
+         0.107
+         0.12
+</constant>
+        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
+         650.0
+         800.0
+         1100.0
+         1400.0
+         1700.0
+         2000.0
+         2300.0
+         2600.0
+         2900.0
+         3200.0
+         3500.0
+         3800.0
+         4100.0
+         4400.0
+         4700.0
+         7000.0
+</constant>
+        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+</constant>
+        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
+         650.0
+         800.0
+         3750.0
+         7000.0
+</constant>
+        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
+         1.0
+         1.0
+         1.0
+         1.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
+         -20.0
+         0.0
+         40.0
+         80.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
+         0.0
+         0.71
+         1.43
+         2.14
+         2.86
+         3.57
+         4.29
+         5.0
+</constant>
+        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         14.0
+         15.0
+</constant>
+        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
+         1.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.19.XXX.4275859823" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.22.XXX.4019883890" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/generated/simulator_tune_POLARIS_RZR.msq b/generated/simulator_tune_POLARIS_RZR.msq
index ba94ac9..3dbac88 100644
--- a/generated/simulator_tune_POLARIS_RZR.msq
+++ b/generated/simulator_tune_POLARIS_RZR.msq
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <msq xmlns="http://www.msefi.com/:msq">
     <page/>
-    <page number="0" size="22428">
+    <page number="0" size="22400">
         <constant name="engineType">"POLARIS_RZR"</constant>
         <constant digits="0" name="startButtonSuppressOnStartUpMs" units="">1000.0</constant>
         <constant digits="0" name="sensorSnifferRpmThreshold" units="RPM">2500.0</constant>
@@ -12,26 +12,25 @@
         <constant digits="0" name="maxAcRpm" units="rpm">5000.0</constant>
         <constant digits="0" name="maxAcTps" units="%">75.0</constant>
         <constant digits="0" name="maxAcClt" units="deg C">100.0</constant>
-        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
-         650.0
-         800.0
-         1100.0
-         1400.0
-         1700.0
-         2000.0
-         2300.0
-         2600.0
-         2900.0
-         3200.0
-         3500.0
-         3800.0
-         4100.0
-         4400.0
-         4700.0
-         7000.0
-</constant>
+        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
+        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
+        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
+        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
+        <constant name="mainRelayPin">"NONE"</constant>
+        <constant name="sdCardCsPin">"NONE"</constant>
+        <constant name="canTxPin">"NONE"</constant>
+        <constant name="canRxPin">"NONE"</constant>
+        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
+        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
+        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
+        <constant name="tachOutputPin">"NONE"</constant>
+        <constant name="tachOutputPinMode">"default"</constant>
+        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
+        <constant digits="0" name="manIdlePosition" units="%">50.0</constant>
         <constant digits="0" name="multisparkMaxSparkingAngle" units="deg">30.0</constant>
         <constant digits="0" name="multisparkMaxExtraSparkCount" units="count">2.0</constant>
+        <constant digits="0" name="vvtControlMinRpm" units="RPM">2000.0</constant>
         <constant digits="2" name="injector_flow" units="cm3/min">320.0</constant>
         <constant cols="1" digits="2" name="injector_battLagCorrBins" rows="8">
          6.0
@@ -182,6 +181,7 @@
         <constant digits="0" name="triggerSimulatorRpm" units="RPM">1200.0</constant>
         <constant digits="0" name="cylindersCount" units="">3.0</constant>
         <constant name="firingOrder">"1-2-3"</constant>
+        <constant digits="0" name="justATempTest" units="">0.0</constant>
         <constant name="communityCommsLedPid">"NONE"</constant>
         <constant digits="2" name="cylinderBore" units="mm">87.5</constant>
         <constant name="fuelAlgorithm">"Speed Density"</constant>
@@ -195,8 +195,10 @@
         <constant name="ignitionMode">"Individual Coils"</constant>
         <constant digits="0" name="gapTrackingLengthOverride" units="count">0.0</constant>
         <constant digits="0" name="maxIdleVss" units="kph">0.0</constant>
+        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
         <constant digits="0" name="minOilPressureAfterStart" units="kPa">0.0</constant>
         <constant name="timingMode">"dynamic"</constant>
+        <constant name="canNbcType">"None"</constant>
         <constant digits="0" name="fixedModeTiming" units="RPM">50.0</constant>
         <constant digits="0" name="globalTriggerAngleOffset" units="deg btdc">0.0</constant>
         <constant digits="2" name="analogInputDividerCoefficient" units="coef">2.0</constant>
@@ -205,12 +207,7 @@
         <constant digits="0" name="fanOffTemperature" units="deg C">82.0</constant>
         <constant name="acrPin">"NONE"</constant>
         <constant digits="1" name="driveWheelRevPerKm" units="revs/km">1000.0</constant>
-        <constant name="canNbcType">"None"</constant>
         <constant digits="2" name="canSleepPeriodMs" units="ms">50.0</constant>
-        <constant digits="0" name="camDecoder2jzPrecision" units="">40.0</constant>
-        <constant digits="0" name="justATempTest" units="">0.0</constant>
-        <constant digits="0" name="unusedHere333" units="">0.0</constant>
-        <constant digits="0" name="unusedHere334" units="">0.0</constant>
         <constant digits="0" name="byFirmwareVersion" units="index">0.0</constant>
         <constant name="tps1_1AdcChannel">"Disabled"</constant>
         <constant name="vbattAdcChannel">"Disabled"</constant>
@@ -226,7 +223,7 @@
         <constant digits="0" name="boostControlSafeDutyCycle" units="%">0.0</constant>
         <constant name="mafAdcChannel">"Disabled"</constant>
         <constant digits="0" name="acrRevolutions" units="">5.0</constant>
-        <constant digits="0" name="calibrationBirthday" units="">2.0240319E7</constant>
+        <constant digits="0" name="calibrationBirthday" units="">2.0240322E7</constant>
         <constant digits="3" name="adcVcc" units="volts">3.0</constant>
         <constant digits="0" name="mapCamDetectionAnglePosition" units="Deg">0.0</constant>
         <constant name="camInputs1">"PE15"</constant>
@@ -254,12 +251,12 @@
         <constant name="idle_stepperDirectionPin">"NONE"</constant>
         <constant name="idle_stepperStepPin">"NONE"</constant>
         <constant name="idle_solenoidPinMode">"default"</constant>
-        <constant digits="0" name="manIdlePosition" units="%">50.0</constant>
         <constant digits="1" name="knockRetardAggression" units="%">20.0</constant>
         <constant digits="1" name="knockRetardReapplyRate" units="deg/s">3.0</constant>
         <constant name="engineSyncCam">"Intake First Bank"</constant>
-        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
+        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="3" name="vssGearRatio" units="ratio">3.73</constant>
+        <constant digits="0" name="vssFilterReciprocal" units="">3.0</constant>
         <constant digits="0" name="vssToothCount" units="count">10.0</constant>
         <constant name="idleVeOverrideMode">"None"</constant>
         <constant name="l9779_cs">"NONE"</constant>
@@ -308,22 +305,13 @@
         <constant name="max31855spiDevice">"Off"</constant>
         <constant name="debugTriggerSync">"NONE"</constant>
         <constant name="digitalPotentiometerSpiDevice">"Off"</constant>
+        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant name="mc33972_cs">"NONE"</constant>
         <constant name="mc33972_csPinMode">"default"</constant>
         <constant name="auxFastSensor1_adcChannel">"Disabled"</constant>
         <constant name="tps1_2AdcChannel">"Disabled"</constant>
         <constant name="tps2_2AdcChannel">"Disabled"</constant>
         <constant name="throttlePedalPositionSecondAdcChannel">"Disabled"</constant>
-        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant name="afr_type">"14Point7"</constant>
         <constant name="mc33810_cs1">"NONE"</constant>
         <constant digits="4" name="idle_antiwindupFreq" units="x">0.0</constant>
@@ -331,23 +319,10 @@
         <constant name="triggerInputPins2">"NONE"</constant>
         <constant digits="0" name="mc33_t_min_boost" units="us">100.0</constant>
         <constant name="hip9011CsPinMode">"default"</constant>
-        <constant name="tachOutputPin">"NONE"</constant>
-        <constant name="tachOutputPinMode">"default"</constant>
-        <constant name="mainRelayPin">"NONE"</constant>
-        <constant name="sdCardCsPin">"NONE"</constant>
-        <constant name="canTxPin">"NONE"</constant>
-        <constant name="canRxPin">"NONE"</constant>
         <constant name="throttlePedalUpPinMode">"DEFAULT"</constant>
-        <constant digits="0" name="acIdleExtraOffset" units="%">15.0</constant>
         <constant digits="2" name="finalGearRatio" units="ratio">1.0</constant>
         <constant name="tcuInputSpeedSensorPin">"NONE"</constant>
         <constant digits="0" name="tcuInputSpeedSensorTeeth" units="">1.0</constant>
-        <constant digits="0" name="wastegatePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="wastegatePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="idlePositionMin" units="mv">0.0</constant>
-        <constant digits="0" name="idlePositionMax" units="mv">5000.0</constant>
-        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
-        <constant digits="1" name="compressionRatio" units="CR">9.0</constant>
         <constant name="triggerSimulatorPins1">"NONE"</constant>
         <constant name="triggerSimulatorPins2">"NONE"</constant>
         <constant digits="3" name="fordInjectorSmallPulseSlope" units="g/s">0.0</constant>
@@ -403,27 +378,7 @@
         <constant name="acFanPin">"NONE"</constant>
         <constant name="acFanPinMode">"default"</constant>
         <constant name="l9779spiDevice">"Off"</constant>
-        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         14.0
-         15.0
-</constant>
         <constant name="imuType">"None"</constant>
-        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
-         1.26
-         1.2
-         1.16
-         1.1
-         1.06
-         1.0
-         0.9
-         0.8
-</constant>
         <constant digits="0" name="vehicleWeight" units="kg">0.0</constant>
         <constant digits="0" name="idlePidRpmUpperLimit" units="RPM">300.0</constant>
         <constant digits="3" name="applyNonlinearBelowPulse" units="ms">0.0</constant>
@@ -454,6 +409,8 @@
         <constant name="starterRelayDisablePinMode">"default"</constant>
         <constant name="secondSolenoidPin">"NONE"</constant>
         <constant name="startStopButtonPin">"PA1"</constant>
+        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
+        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="0" name="mapMinBufferLength" units="count">1.0</constant>
         <constant digits="0" name="idlePidDeactivationTpsThreshold" units="%">2.0</constant>
         <constant digits="0" name="stepperParkingExtraSteps" units="%">0.0</constant>
@@ -466,8 +423,6 @@
         <constant name="acRelayPin">"NONE"</constant>
         <constant digits="0" name="lambdaProtectionMinTps" units="%">50.0</constant>
         <constant digits="1" name="lambdaProtectionTimeout" units="s">0.5</constant>
-        <constant digits="0" name="lambdaProtectionRestoreRpm" units="RPM">2000.0</constant>
-        <constant name="acRelayPinMode">"default"</constant>
         <constant digits="2" name="scriptSetting1" units="">0.0</constant>
         <constant digits="2" name="scriptSetting2" units="">0.0</constant>
         <constant digits="2" name="scriptSetting3" units="">0.0</constant>
@@ -546,6 +501,8 @@
         <constant digits="0" name="boostPwmFrequency" units="Hz">33.0</constant>
         <constant name="launchActivationMode">"Launch Button"</constant>
         <constant name="antiLagActivationMode">"Switch Input"</constant>
+        <constant digits="2" name="tpsAccelLookback" units="sec">0.3</constant>
+        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="0" name="launchSpeedThreshold" units="Kph">30.0</constant>
         <constant digits="0" name="launchRpmWindow" units="RPM">500.0</constant>
         <constant digits="0" name="launchSparkSkipPercent" units="%">0.0</constant>
@@ -596,16 +553,6 @@
         <constant name="drv8860_cs">"NONE"</constant>
         <constant name="drv8860_csPinMode">"default"</constant>
         <constant name="drv8860_miso">"NONE"</constant>
-        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
-         0.0
-         0.71
-         1.43
-         2.14
-         2.86
-         3.57
-         4.29
-         5.0
-</constant>
         <constant name="luaOutputPins1">"NONE"</constant>
         <constant name="luaOutputPins2">"NONE"</constant>
         <constant name="luaOutputPins3">"NONE"</constant>
@@ -811,10 +758,8 @@
         <constant name="auxSerialTxPin">"NONE"</constant>
         <constant name="auxSerialRxPin">"NONE"</constant>
         <constant name="accelerometerCsPin">"NONE"</constant>
-        <constant digits="2" name="tpsAccelLookback" units="sec">0.3</constant>
         <constant digits="0" name="coastingFuelCutVssLow" units="kph">0.0</constant>
         <constant digits="0" name="coastingFuelCutVssHigh" units="kph">0.0</constant>
-        <constant digits="1" name="noFuelTrimAfterDfcoTime" units="sec">0.0</constant>
         <constant digits="1" name="tpsAccelEnrichmentThreshold" units="roc">12.0</constant>
         <constant name="auxSpeedSensorInputPin1">"NONE"</constant>
         <constant name="auxSpeedSensorInputPin2">"NONE"</constant>
@@ -903,7 +848,6 @@
         <constant name="vvtPins2">"NONE"</constant>
         <constant name="vvtPins3">"NONE"</constant>
         <constant name="vvtPins4">"NONE"</constant>
-        <constant name="sdCardCsPinMode">"default"</constant>
         <constant digits="0" name="crankingIACposition" units="percent">50.0</constant>
         <constant digits="4" name="tChargeMinRpmMinTps" units="">0.25</constant>
         <constant digits="4" name="tChargeMinRpmMaxTps" units="">0.25</constant>
@@ -1021,7 +965,6 @@
         <constant name="mc33816_rstb">"NONE"</constant>
         <constant name="mc33816_driven">"NONE"</constant>
         <constant name="brakePedalPin">"NONE"</constant>
-        <constant name="brakePedalPinMode">"PULLUP"</constant>
         <constant digits="4" name="auxPid1_pFactor" units="">2.0</constant>
         <constant digits="4" name="auxPid1_iFactor" units="">0.005</constant>
         <constant digits="4" name="auxPid1_dFactor" units="">0.0</constant>
@@ -1068,12 +1011,7 @@
         <constant name="tle8888_csPinMode">"default"</constant>
         <constant name="mc33816_cs">"NONE"</constant>
         <constant digits="1" name="auxFrequencyFilter" units="hz">0.0</constant>
-        <constant digits="0" name="vvtControlMinRpm" units="RPM">2000.0</constant>
         <constant name="sentInputPins1">"NONE"</constant>
-        <constant digits="0" name="launchFuelAdderPercent" units="%">0.0</constant>
-        <constant digits="2" name="etbJamTimeout" units="sec">0.0</constant>
-        <constant digits="0" name="etbExpAverageLength" units="">50.0</constant>
-        <constant digits="0" name="unused645646" units="">0.0</constant>
         <constant digits="0" name="coastingFuelCutRpmHigh" units="rpm">1500.0</constant>
         <constant digits="0" name="coastingFuelCutRpmLow" units="rpm">1300.0</constant>
         <constant digits="0" name="coastingFuelCutTps" units="%">2.0</constant>
@@ -1090,24 +1028,11 @@
         <constant digits="2" name="lowPressureFuel_value1" units="">0.0</constant>
         <constant digits="2" name="lowPressureFuel_v2" units="volts">0.0</constant>
         <constant digits="2" name="lowPressureFuel_value2" units="">0.0</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
-         -20.0
-         0.0
-         40.0
-         80.0
-</constant>
-        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
         <constant digits="3" name="tChargeAirCoefMin" units="">0.098</constant>
         <constant digits="3" name="tChargeAirCoefMax" units="">0.902</constant>
         <constant digits="1" name="tChargeAirFlowMax" units="kg/h">153.6</constant>
         <constant digits="1" name="tChargeAirIncrLimit" units="deg/sec">1.0</constant>
         <constant digits="1" name="tChargeAirDecrLimit" units="deg/sec">12.5</constant>
-        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="2" name="hip9011Gain" units="">1.0</constant>
         <constant digits="0" name="etb_iTermMin" units="">-30.0</constant>
         <constant digits="0" name="etb_iTermMax" units="">30.0</constant>
@@ -1129,10 +1054,10 @@
         <constant digits="1" name="stoichRatioPrimary" units=":1">14.7</constant>
         <constant digits="0" name="idlerpmpid_iTermMax" units="">20.0</constant>
         <constant digits="0" name="etbIdleThrottleRange" units="%">10.0</constant>
-        <constant digits="0" name="cylinderBankSelect1" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect2" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect3" units="">0.0</constant>
-        <constant digits="0" name="cylinderBankSelect4" units="">0.0</constant>
+        <constant digits="0" name="cylinderBankSelect1" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect2" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect3" units="">1.0</constant>
+        <constant digits="0" name="cylinderBankSelect4" units="">1.0</constant>
         <constant digits="0" name="cylinderBankSelect5" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect6" units="">0.0</constant>
         <constant digits="0" name="cylinderBankSelect7" units="">0.0</constant>
@@ -1340,24 +1265,6 @@
         <constant name="tcu_solenoid_mode4">"default"</constant>
         <constant name="tcu_solenoid_mode5">"default"</constant>
         <constant name="tcu_solenoid_mode6">"default"</constant>
-        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-         -20.0
-</constant>
         <constant digits="3" name="triggerGapOverrideFrom1" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom2" units="ratio">0.0</constant>
         <constant digits="3" name="triggerGapOverrideFrom3" units="ratio">0.0</constant>
@@ -1397,13 +1304,8 @@
         <constant digits="0" name="maxCamPhaseResolveRpm" units="rpm">0.0</constant>
         <constant digits="1" name="dfcoDelay" units="sec">0.0</constant>
         <constant digits="1" name="acDelay" units="sec">0.5</constant>
+        <constant name="tChargeMode">"RPM+TPS (Default)"</constant>
         <constant digits="3" name="fordInjectorSmallPulseBreakPoint" units="mg">0.0</constant>
-        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
-         1.0
-         1.0
-         1.0
-         1.0
-</constant>
         <constant digits="0" name="etbJamIntegratorLimit" units="%">0.0</constant>
         <constant digits="0" name="hpfpCamLobes" units="lobes/cam">3.0</constant>
         <constant name="hpfpCam">"NONE"</constant>
@@ -1415,134 +1317,6 @@
         <constant digits="3" name="hpfpPidP" units="%/kPa">0.01</constant>
         <constant digits="5" name="hpfpPidI" units="%/kPa/lobe">3.0E-4</constant>
         <constant digits="0" name="hpfpTargetDecay" units="kPa/s">2000.0</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
-         0.0
-         1.0
-         4.5
-         9.5
-         16.5
-         25.0
-         34.5
-         45.0
-         55.0
-         65.5
-         75.0
-         83.5
-         90.5
-         95.5
-         99.0
-         100.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
-         0.0
-         7.5
-         16.5
-         24.0
-         32.0
-         40.0
-         48.0
-         56.0
-         64.0
-         72.0
-         80.0
-         88.0
-         96.0
-         103.5
-         112.5
-         120.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
-         8.0
-         9.0
-         10.0
-         11.0
-         12.0
-         13.0
-         15.0
-         16.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
-</constant>
-        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-         120.0
-         140.0
-         160.0
-         180.0
-</constant>
-        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
-        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
-</constant>
-        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
-         0.005
-         0.018
-         0.031
-         0.043
-         0.056
-         0.069
-         0.082
-         0.094
-         0.107
-         0.12
-</constant>
-        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
-         650.0
-         800.0
-         1450.0
-         2100.0
-         2750.0
-         3400.0
-         4050.0
-         4700.0
-         5350.0
-         7000.0
-</constant>
         <constant name="stepper_raw_output1">"NONE"</constant>
         <constant name="stepper_raw_output2">"NONE"</constant>
         <constant name="stepper_raw_output3">"NONE"</constant>
@@ -1558,66 +1332,6 @@
         <constant digits="2" name="gearRatio9" units="ratio">0.0</constant>
         <constant digits="2" name="gearRatio10" units="ratio">0.0</constant>
         <constant digits="0" name="vvtActivationDelayMs" units="ms">6000.0</constant>
-        <constant cols="1" digits="0" name="wwCltBins" rows="8">
-         -40.0
-         -20.0
-         0.0
-         20.0
-         40.0
-         60.0
-         80.0
-         100.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
-         1.45
-         1.3
-         1.17
-         1.05
-         0.9
-         0.82
-         0.75
-         0.7
-</constant>
-        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
-         0.73
-         0.66
-         0.57
-         0.46
-         0.38
-         0.31
-         0.24
-         0.19
-</constant>
-        <constant cols="1" digits="0" name="wwMapBins" rows="8">
-         10.0
-         20.0
-         30.0
-         40.0
-         50.0
-         60.0
-         70.0
-         80.0
-</constant>
-        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
-         0.38
-         0.55
-         0.69
-         0.86
-         0.9
-         0.95
-         0.97
-         1.0
-</constant>
-        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
-         0.21
-         0.4
-         0.6
-         0.79
-         0.85
-         0.9
-         0.95
-         1.0
-</constant>
         <constant cols="6" digits="0" name="torqueTable" rows="6">
          0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0
@@ -1703,7 +1417,6 @@
          0.0
          0.0
 </constant>
-        <constant digits="0" name="unused3124141" units="">0.0</constant>
         <constant name="fuelPressureSensorMode">"Absolute"</constant>
         <constant name="luaDigitalInputPins1">"NONE"</constant>
         <constant name="luaDigitalInputPins2">"NONE"</constant>
@@ -1713,12 +1426,6 @@
         <constant name="luaDigitalInputPins6">"NONE"</constant>
         <constant name="luaDigitalInputPins7">"NONE"</constant>
         <constant name="luaDigitalInputPins8">"NONE"</constant>
-        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
-         650.0
-         800.0
-         3750.0
-         7000.0
-</constant>
         <constant digits="0" name="ALSMinRPM" units="rpm">400.0</constant>
         <constant digits="0" name="ALSMaxRPM" units="rpm">3200.0</constant>
         <constant digits="0" name="ALSMaxDuration" units="sec">3.0</constant>
@@ -1894,7 +1601,124 @@
         <constant name="spi5MisoMode">"default"</constant>
         <constant name="spi6SckMode">"default"</constant>
         <constant name="spi6MosiMode">"default"</constant>
-        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="120">
+        <constant digits="0" name="tunerStudioSerialSpeed" units="BPs">38400.0</constant>
+        <constant cols="1" digits="0" name="unusedOftenChangesDuringFirmwareUpdate" rows="236">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
          0.0
          0.0
          0.0
@@ -2380,40 +2204,22 @@
          0.0
          0.0
 </constant>
-        <constant cols="1" digits="0" name="unusedGapInCalibration" rows="32">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-</constant>
+        <constant digits="0" name="fancyOptions1" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions2" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions3" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions4" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions5" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions6" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions7" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions8" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions9" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions10" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions11" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions12" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions13" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions14" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions15" units="">0.0</constant>
+        <constant digits="0" name="fancyOptions16" units="">0.0</constant>
         <constant cols="8" digits="1" name="boostTableOpenLoop" rows="8">
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
          0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
@@ -4551,9 +4357,297 @@ end</constant>
          3600.0
          5000.0
          7000.0
+</constant>
+        <constant cols="1" digits="0" name="wwCltBins" rows="8">
+         -40.0
+         -20.0
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauCltValues" rows="8">
+         1.45
+         1.3
+         1.17
+         1.05
+         0.9
+         0.82
+         0.75
+         0.7
+</constant>
+        <constant cols="1" digits="2" name="wwBetaCltValues" rows="8">
+         0.73
+         0.66
+         0.57
+         0.46
+         0.38
+         0.31
+         0.24
+         0.19
+</constant>
+        <constant cols="1" digits="0" name="wwMapBins" rows="8">
+         10.0
+         20.0
+         30.0
+         40.0
+         50.0
+         60.0
+         70.0
+         80.0
+</constant>
+        <constant cols="1" digits="2" name="wwTauMapValues" rows="8">
+         0.38
+         0.55
+         0.69
+         0.86
+         0.9
+         0.95
+         0.97
+         1.0
+</constant>
+        <constant cols="1" digits="2" name="wwBetaMapValues" rows="8">
+         0.21
+         0.4
+         0.6
+         0.79
+         0.85
+         0.9
+         0.95
+         1.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileQuantityBins" rows="16">
+         0.0
+         1.0
+         4.5
+         9.5
+         16.5
+         25.0
+         34.5
+         45.0
+         55.0
+         65.5
+         75.0
+         83.5
+         90.5
+         95.5
+         99.0
+         100.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpLobeProfileAngle" rows="16">
+         0.0
+         7.5
+         16.5
+         24.0
+         32.0
+         40.0
+         48.0
+         56.0
+         64.0
+         72.0
+         80.0
+         88.0
+         96.0
+         103.5
+         112.5
+         120.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpDeadtimeVoltsBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         15.0
+         16.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpDeadtimeMS" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpTarget" rows="10">
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+         5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0 5000.0
+</constant>
+        <constant cols="1" digits="1" name="hpfpTargetLoadBins" rows="10">
+         0.0
+         20.0
+         40.0
+         60.0
+         80.0
+         100.0
+         120.0
+         140.0
+         160.0
+         180.0
+</constant>
+        <constant cols="1" digits="0" name="hpfpTargetRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="10" digits="0" name="hpfpCompensation" rows="10">
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+         0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+</constant>
+        <constant cols="1" digits="3" name="hpfpCompensationLoadBins" rows="10">
+         0.005
+         0.018
+         0.031
+         0.043
+         0.056
+         0.069
+         0.082
+         0.094
+         0.107
+         0.12
+</constant>
+        <constant cols="1" digits="0" name="hpfpCompensationRpmBins" rows="10">
+         650.0
+         800.0
+         1450.0
+         2100.0
+         2750.0
+         3400.0
+         4050.0
+         4700.0
+         5350.0
+         7000.0
+</constant>
+        <constant cols="1" digits="0" name="knockNoiseRpmBins" rows="16">
+         650.0
+         800.0
+         1100.0
+         1400.0
+         1700.0
+         2000.0
+         2300.0
+         2600.0
+         2900.0
+         3200.0
+         3500.0
+         3800.0
+         4100.0
+         4400.0
+         4700.0
+         7000.0
+</constant>
+        <constant cols="1" digits="1" name="knockBaseNoise" rows="16">
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+         -20.0
+</constant>
+        <constant cols="1" digits="0" name="tpsTspCorrValuesBins" rows="4">
+         650.0
+         800.0
+         3750.0
+         7000.0
+</constant>
+        <constant cols="1" digits="2" name="tpsTspCorrValues" rows="4">
+         1.0
+         1.0
+         1.0
+         1.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpmBins" rows="4">
+         -20.0
+         0.0
+         40.0
+         80.0
+</constant>
+        <constant cols="1" digits="0" name="cltRevLimitRpm" rows="4">
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="3" name="fuelLevelBins" rows="8">
+         0.0
+         0.71
+         1.43
+         2.14
+         2.86
+         3.57
+         4.29
+         5.0
+</constant>
+        <constant cols="1" digits="0" name="fuelLevelValues" rows="8">
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+         0.0
+</constant>
+        <constant cols="1" digits="1" name="dwellVoltageCorrVoltBins" rows="8">
+         8.0
+         9.0
+         10.0
+         11.0
+         12.0
+         13.0
+         14.0
+         15.0
+</constant>
+        <constant cols="1" digits="2" name="dwellVoltageCorrValues" rows="8">
+         1.26
+         1.2
+         1.16
+         1.1
+         1.06
+         1.0
+         0.9
+         0.8
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.19.XXX.4275859823" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI default.2024.03.22.XXX.4019883890" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>