diff --git a/simulator/generated/simulator_tune.xml b/simulator/generated/simulator_tune.xml
index fcda5fcebb..271630eda8 100644
--- a/simulator/generated/simulator_tune.xml
+++ b/simulator/generated/simulator_tune.xml
@@ -82,6 +82,9 @@
         <constant name="cltSensorPulldown">"false"</constant>
         <constant name="iatSensorPulldown">"false"</constant>
         <constant name="allowIdenticalPps">"false"</constant>
+        <constant name="overrideVvtTriggerGaps">"false"</constant>
+        <constant name="unused30">"false"</constant>
+        <constant name="unused31">"false"</constant>
         <constant digits="0" name="tpsMin" units="ADC">0.0</constant>
         <constant digits="0" name="tpsMax" units="ADC">1000.0</constant>
         <constant digits="0" name="tpsErrorDetectionTooLow" units="%">-10.0</constant>
@@ -263,6 +266,7 @@
         <constant name="ignitionPinMode">"default"</constant>
         <constant name="fuelPumpPin">"NONE"</constant>
         <constant name="fuelPumpPinMode">"default"</constant>
+        <constant digits="0" name="gapVvtTrackingLengthOverride" units="count">0.0</constant>
         <constant name="malfunctionIndicatorPin">"NONE"</constant>
         <constant name="malfunctionIndicatorPinMode">"default"</constant>
         <constant name="fanPinMode">"default"</constant>
@@ -1766,41 +1770,16 @@
         <constant digits="0" name="simulatorCamPosition2" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition3" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition4" units="">0.0</constant>
-        <constant cols="1" digits="0" name="mainUnusedEnd" rows="242">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         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 digits="0" name="unusedExplicitFilling2" units="">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideFrom1" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideFrom2" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideFrom3" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideFrom4" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideTo1" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideTo2" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideTo3" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideTo4" units="ratio">0.0</constant>
+        <constant cols="1" digits="0" name="mainUnusedEnd" rows="208">
          0.0
          0.0
          0.0
@@ -4985,7 +4964,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20231120" nPages="1" signature="rusEFI master.2023.11.30.f407-discovery.2739034009" version="5.0"/>
+    <versionInfo firmwareInfo="20231120" nPages="1" signature="rusEFI master.2023.11.30.f407-discovery.1259297189" version="5.0"/>
     <bibliography author="rusEFI 20231120" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_104.xml b/simulator/generated/simulator_tune_104.xml
index c27afe6bd7..cccd14f5ff 100644
--- a/simulator/generated/simulator_tune_104.xml
+++ b/simulator/generated/simulator_tune_104.xml
@@ -82,6 +82,9 @@
         <constant name="cltSensorPulldown">"false"</constant>
         <constant name="iatSensorPulldown">"false"</constant>
         <constant name="allowIdenticalPps">"false"</constant>
+        <constant name="overrideVvtTriggerGaps">"false"</constant>
+        <constant name="unused30">"false"</constant>
+        <constant name="unused31">"false"</constant>
         <constant digits="0" name="tpsMin" units="ADC">98.0</constant>
         <constant digits="0" name="tpsMax" units="ADC">926.0</constant>
         <constant digits="0" name="tpsErrorDetectionTooLow" units="%">-10.0</constant>
@@ -263,6 +266,7 @@
         <constant name="ignitionPinMode">"default"</constant>
         <constant name="fuelPumpPin">"NONE"</constant>
         <constant name="fuelPumpPinMode">"default"</constant>
+        <constant digits="0" name="gapVvtTrackingLengthOverride" units="count">0.0</constant>
         <constant name="malfunctionIndicatorPin">"NONE"</constant>
         <constant name="malfunctionIndicatorPinMode">"default"</constant>
         <constant name="fanPinMode">"default"</constant>
@@ -1768,41 +1772,16 @@
         <constant digits="0" name="simulatorCamPosition2" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition3" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition4" units="">0.0</constant>
-        <constant cols="1" digits="0" name="mainUnusedEnd" rows="242">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         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 digits="0" name="unusedExplicitFilling2" units="">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideFrom1" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideFrom2" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideFrom3" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideFrom4" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideTo1" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideTo2" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideTo3" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideTo4" units="ratio">0.0</constant>
+        <constant cols="1" digits="0" name="mainUnusedEnd" rows="208">
          0.0
          0.0
          0.0
@@ -5080,7 +5059,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20231120" nPages="1" signature="rusEFI master.2023.11.30.f407-discovery.2739034009" version="5.0"/>
+    <versionInfo firmwareInfo="20231120" nPages="1" signature="rusEFI master.2023.11.30.f407-discovery.1259297189" version="5.0"/>
     <bibliography author="rusEFI 20231120" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_68.xml b/simulator/generated/simulator_tune_68.xml
index 2a9039c66f..7f92a333cd 100644
--- a/simulator/generated/simulator_tune_68.xml
+++ b/simulator/generated/simulator_tune_68.xml
@@ -82,6 +82,9 @@
         <constant name="cltSensorPulldown">"false"</constant>
         <constant name="iatSensorPulldown">"false"</constant>
         <constant name="allowIdenticalPps">"false"</constant>
+        <constant name="overrideVvtTriggerGaps">"false"</constant>
+        <constant name="unused30">"false"</constant>
+        <constant name="unused31">"false"</constant>
         <constant digits="0" name="tpsMin" units="ADC">891.0</constant>
         <constant digits="0" name="tpsMax" units="ADC">69.0</constant>
         <constant digits="0" name="tpsErrorDetectionTooLow" units="%">-10.0</constant>
@@ -263,6 +266,7 @@
         <constant name="ignitionPinMode">"default"</constant>
         <constant name="fuelPumpPin">"TLE8888_21"</constant>
         <constant name="fuelPumpPinMode">"default"</constant>
+        <constant digits="0" name="gapVvtTrackingLengthOverride" units="count">0.0</constant>
         <constant name="malfunctionIndicatorPin">"NONE"</constant>
         <constant name="malfunctionIndicatorPinMode">"default"</constant>
         <constant name="fanPinMode">"default"</constant>
@@ -1768,41 +1772,16 @@
         <constant digits="0" name="simulatorCamPosition2" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition3" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition4" units="">0.0</constant>
-        <constant cols="1" digits="0" name="mainUnusedEnd" rows="242">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         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 digits="0" name="unusedExplicitFilling2" units="">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideFrom1" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideFrom2" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideFrom3" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideFrom4" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideTo1" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideTo2" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideTo3" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideTo4" units="ratio">0.0</constant>
+        <constant cols="1" digits="0" name="mainUnusedEnd" rows="208">
          0.0
          0.0
          0.0
@@ -4987,7 +4966,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20231120" nPages="1" signature="rusEFI master.2023.11.30.f407-discovery.2739034009" version="5.0"/>
+    <versionInfo firmwareInfo="20231120" nPages="1" signature="rusEFI master.2023.11.30.f407-discovery.1259297189" version="5.0"/>
     <bibliography author="rusEFI 20231120" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_82.xml b/simulator/generated/simulator_tune_82.xml
index 2284fd4145..343b870fcd 100644
--- a/simulator/generated/simulator_tune_82.xml
+++ b/simulator/generated/simulator_tune_82.xml
@@ -82,6 +82,9 @@
         <constant name="cltSensorPulldown">"false"</constant>
         <constant name="iatSensorPulldown">"false"</constant>
         <constant name="allowIdenticalPps">"false"</constant>
+        <constant name="overrideVvtTriggerGaps">"false"</constant>
+        <constant name="unused30">"false"</constant>
+        <constant name="unused31">"false"</constant>
         <constant digits="0" name="tpsMin" units="ADC">98.0</constant>
         <constant digits="0" name="tpsMax" units="ADC">926.0</constant>
         <constant digits="0" name="tpsErrorDetectionTooLow" units="%">-10.0</constant>
@@ -263,6 +266,7 @@
         <constant name="ignitionPinMode">"default"</constant>
         <constant name="fuelPumpPin">"NONE"</constant>
         <constant name="fuelPumpPinMode">"default"</constant>
+        <constant digits="0" name="gapVvtTrackingLengthOverride" units="count">0.0</constant>
         <constant name="malfunctionIndicatorPin">"NONE"</constant>
         <constant name="malfunctionIndicatorPinMode">"default"</constant>
         <constant name="fanPinMode">"default"</constant>
@@ -1768,41 +1772,16 @@
         <constant digits="0" name="simulatorCamPosition2" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition3" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition4" units="">0.0</constant>
-        <constant cols="1" digits="0" name="mainUnusedEnd" rows="242">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         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 digits="0" name="unusedExplicitFilling2" units="">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideFrom1" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideFrom2" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideFrom3" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideFrom4" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideTo1" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideTo2" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideTo3" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideTo4" units="ratio">0.0</constant>
+        <constant cols="1" digits="0" name="mainUnusedEnd" rows="208">
          0.0
          0.0
          0.0
@@ -5037,7 +5016,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20231120" nPages="1" signature="rusEFI master.2023.11.30.f407-discovery.2739034009" version="5.0"/>
+    <versionInfo firmwareInfo="20231120" nPages="1" signature="rusEFI master.2023.11.30.f407-discovery.1259297189" version="5.0"/>
     <bibliography author="rusEFI 20231120" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_90.xml b/simulator/generated/simulator_tune_90.xml
index 0f39b3dc4f..973f62e3ff 100644
--- a/simulator/generated/simulator_tune_90.xml
+++ b/simulator/generated/simulator_tune_90.xml
@@ -82,6 +82,9 @@
         <constant name="cltSensorPulldown">"false"</constant>
         <constant name="iatSensorPulldown">"false"</constant>
         <constant name="allowIdenticalPps">"false"</constant>
+        <constant name="overrideVvtTriggerGaps">"false"</constant>
+        <constant name="unused30">"false"</constant>
+        <constant name="unused31">"false"</constant>
         <constant digits="0" name="tpsMin" units="ADC">100.0</constant>
         <constant digits="0" name="tpsMax" units="ADC">830.0</constant>
         <constant digits="0" name="tpsErrorDetectionTooLow" units="%">-10.0</constant>
@@ -263,6 +266,7 @@
         <constant name="ignitionPinMode">"default"</constant>
         <constant name="fuelPumpPin">"NONE"</constant>
         <constant name="fuelPumpPinMode">"default"</constant>
+        <constant digits="0" name="gapVvtTrackingLengthOverride" units="count">0.0</constant>
         <constant name="malfunctionIndicatorPin">"NONE"</constant>
         <constant name="malfunctionIndicatorPinMode">"default"</constant>
         <constant name="fanPinMode">"default"</constant>
@@ -1768,41 +1772,16 @@
         <constant digits="0" name="simulatorCamPosition2" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition3" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition4" units="">0.0</constant>
-        <constant cols="1" digits="0" name="mainUnusedEnd" rows="242">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         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 digits="0" name="unusedExplicitFilling2" units="">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideFrom1" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideFrom2" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideFrom3" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideFrom4" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideTo1" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideTo2" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideTo3" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideTo4" units="ratio">0.0</constant>
+        <constant cols="1" digits="0" name="mainUnusedEnd" rows="208">
          0.0
          0.0
          0.0
@@ -4987,7 +4966,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20231120" nPages="1" signature="rusEFI master.2023.11.30.f407-discovery.2739034009" version="5.0"/>
+    <versionInfo firmwareInfo="20231120" nPages="1" signature="rusEFI master.2023.11.30.f407-discovery.1259297189" version="5.0"/>
     <bibliography author="rusEFI 20231120" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_95.xml b/simulator/generated/simulator_tune_95.xml
index e7b468759d..e33cedbe55 100644
--- a/simulator/generated/simulator_tune_95.xml
+++ b/simulator/generated/simulator_tune_95.xml
@@ -82,6 +82,9 @@
         <constant name="cltSensorPulldown">"false"</constant>
         <constant name="iatSensorPulldown">"false"</constant>
         <constant name="allowIdenticalPps">"false"</constant>
+        <constant name="overrideVvtTriggerGaps">"false"</constant>
+        <constant name="unused30">"false"</constant>
+        <constant name="unused31">"false"</constant>
         <constant digits="0" name="tpsMin" units="ADC">98.0</constant>
         <constant digits="0" name="tpsMax" units="ADC">926.0</constant>
         <constant digits="0" name="tpsErrorDetectionTooLow" units="%">-10.0</constant>
@@ -263,6 +266,7 @@
         <constant name="ignitionPinMode">"default"</constant>
         <constant name="fuelPumpPin">"NONE"</constant>
         <constant name="fuelPumpPinMode">"default"</constant>
+        <constant digits="0" name="gapVvtTrackingLengthOverride" units="count">0.0</constant>
         <constant name="malfunctionIndicatorPin">"NONE"</constant>
         <constant name="malfunctionIndicatorPinMode">"default"</constant>
         <constant name="fanPinMode">"default"</constant>
@@ -1768,41 +1772,16 @@
         <constant digits="0" name="simulatorCamPosition2" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition3" units="">0.0</constant>
         <constant digits="0" name="simulatorCamPosition4" units="">0.0</constant>
-        <constant cols="1" digits="0" name="mainUnusedEnd" rows="242">
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         0.0
-         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 digits="0" name="unusedExplicitFilling2" units="">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideFrom1" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideFrom2" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideFrom3" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideFrom4" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideTo1" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideTo2" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideTo3" units="ratio">0.0</constant>
+        <constant digits="3" name="triggerVVTGapOverrideTo4" units="ratio">0.0</constant>
+        <constant cols="1" digits="0" name="mainUnusedEnd" rows="208">
          0.0
          0.0
          0.0
@@ -5037,7 +5016,7 @@ end</constant>
          0.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20231120" nPages="1" signature="rusEFI master.2023.11.30.f407-discovery.2739034009" version="5.0"/>
+    <versionInfo firmwareInfo="20231120" nPages="1" signature="rusEFI master.2023.11.30.f407-discovery.1259297189" version="5.0"/>
     <bibliography author="rusEFI 20231120" writeDate="date"/>
     <settings/>
     <userComments/>