diff --git a/simulator/generated/simulator_tune.msq b/simulator/generated/simulator_tune.msq
index 5c58626be3..9699b6a46f 100644
--- a/simulator/generated/simulator_tune.msq
+++ b/simulator/generated/simulator_tune.msq
@@ -797,6 +797,8 @@
         <constant name="luaCanRxWorkaround">"false"</constant>
         <constant name="flexSensorInverted">"false"</constant>
         <constant name="useHardSkipInTraction">"false"</constant>
+        <constant name="fancySmartS">"false"</constant>
+        <constant name="fancySmartL">"false"</constant>
         <constant name="useAuxSpeedForSlipRatio">"false"</constant>
         <constant name="useVssAsSecondWheelSpeed">"false"</constant>
         <constant name="is_enabled_spi_5">"false"</constant>
@@ -4557,7 +4559,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1449262508" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1090824188" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_BMW_M52.msq b/simulator/generated/simulator_tune_BMW_M52.msq
index 7b151e3b70..d52147e926 100644
--- a/simulator/generated/simulator_tune_BMW_M52.msq
+++ b/simulator/generated/simulator_tune_BMW_M52.msq
@@ -797,6 +797,8 @@
         <constant name="luaCanRxWorkaround">"false"</constant>
         <constant name="flexSensorInverted">"false"</constant>
         <constant name="useHardSkipInTraction">"false"</constant>
+        <constant name="fancySmartS">"false"</constant>
+        <constant name="fancySmartL">"false"</constant>
         <constant name="useAuxSpeedForSlipRatio">"false"</constant>
         <constant name="useVssAsSecondWheelSpeed">"false"</constant>
         <constant name="is_enabled_spi_5">"false"</constant>
@@ -4557,7 +4559,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1449262508" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1090824188" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_HARLEY.msq b/simulator/generated/simulator_tune_HARLEY.msq
index 380b3b6c9f..c35c702fcf 100644
--- a/simulator/generated/simulator_tune_HARLEY.msq
+++ b/simulator/generated/simulator_tune_HARLEY.msq
@@ -798,6 +798,8 @@
         <constant name="luaCanRxWorkaround">"false"</constant>
         <constant name="flexSensorInverted">"false"</constant>
         <constant name="useHardSkipInTraction">"false"</constant>
+        <constant name="fancySmartS">"false"</constant>
+        <constant name="fancySmartL">"false"</constant>
         <constant name="useAuxSpeedForSlipRatio">"false"</constant>
         <constant name="useVssAsSecondWheelSpeed">"false"</constant>
         <constant name="is_enabled_spi_5">"false"</constant>
@@ -4633,7 +4635,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1449262508" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1090824188" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK1.msq b/simulator/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK1.msq
index ef30105c51..4da125e624 100644
--- a/simulator/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK1.msq
+++ b/simulator/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK1.msq
@@ -799,6 +799,8 @@
         <constant name="luaCanRxWorkaround">"false"</constant>
         <constant name="flexSensorInverted">"false"</constant>
         <constant name="useHardSkipInTraction">"false"</constant>
+        <constant name="fancySmartS">"false"</constant>
+        <constant name="fancySmartL">"false"</constant>
         <constant name="useAuxSpeedForSlipRatio">"false"</constant>
         <constant name="useVssAsSecondWheelSpeed">"false"</constant>
         <constant name="is_enabled_spi_5">"false"</constant>
@@ -4606,7 +4608,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1449262508" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1090824188" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK2.msq b/simulator/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK2.msq
index 7c57e8691c..a678152e0c 100644
--- a/simulator/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK2.msq
+++ b/simulator/generated/simulator_tune_HELLEN_154_HYUNDAI_COUPE_BK2.msq
@@ -799,6 +799,8 @@
         <constant name="luaCanRxWorkaround">"false"</constant>
         <constant name="flexSensorInverted">"false"</constant>
         <constant name="useHardSkipInTraction">"false"</constant>
+        <constant name="fancySmartS">"false"</constant>
+        <constant name="fancySmartL">"false"</constant>
         <constant name="useAuxSpeedForSlipRatio">"false"</constant>
         <constant name="useVssAsSecondWheelSpeed">"false"</constant>
         <constant name="is_enabled_spi_5">"false"</constant>
@@ -4606,7 +4608,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1449262508" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1090824188" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_HONDA_K.msq b/simulator/generated/simulator_tune_HONDA_K.msq
index 77476dd632..ce093ee79d 100644
--- a/simulator/generated/simulator_tune_HONDA_K.msq
+++ b/simulator/generated/simulator_tune_HONDA_K.msq
@@ -799,6 +799,8 @@
         <constant name="luaCanRxWorkaround">"false"</constant>
         <constant name="flexSensorInverted">"false"</constant>
         <constant name="useHardSkipInTraction">"false"</constant>
+        <constant name="fancySmartS">"false"</constant>
+        <constant name="fancySmartL">"false"</constant>
         <constant name="useAuxSpeedForSlipRatio">"false"</constant>
         <constant name="useVssAsSecondWheelSpeed">"false"</constant>
         <constant name="is_enabled_spi_5">"false"</constant>
@@ -4559,7 +4561,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1449262508" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1090824188" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_HONDA_OBD1.msq b/simulator/generated/simulator_tune_HONDA_OBD1.msq
index b36376d8d3..5d8568d84f 100644
--- a/simulator/generated/simulator_tune_HONDA_OBD1.msq
+++ b/simulator/generated/simulator_tune_HONDA_OBD1.msq
@@ -798,6 +798,8 @@
         <constant name="luaCanRxWorkaround">"false"</constant>
         <constant name="flexSensorInverted">"false"</constant>
         <constant name="useHardSkipInTraction">"false"</constant>
+        <constant name="fancySmartS">"false"</constant>
+        <constant name="fancySmartL">"false"</constant>
         <constant name="useAuxSpeedForSlipRatio">"false"</constant>
         <constant name="useVssAsSecondWheelSpeed">"false"</constant>
         <constant name="is_enabled_spi_5">"false"</constant>
@@ -4558,7 +4560,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1449262508" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1090824188" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_HYUNDAI_PB.msq b/simulator/generated/simulator_tune_HYUNDAI_PB.msq
index 8d84280a0d..373a143dd6 100644
--- a/simulator/generated/simulator_tune_HYUNDAI_PB.msq
+++ b/simulator/generated/simulator_tune_HYUNDAI_PB.msq
@@ -799,6 +799,8 @@
         <constant name="luaCanRxWorkaround">"false"</constant>
         <constant name="flexSensorInverted">"false"</constant>
         <constant name="useHardSkipInTraction">"false"</constant>
+        <constant name="fancySmartS">"false"</constant>
+        <constant name="fancySmartL">"false"</constant>
         <constant name="useAuxSpeedForSlipRatio">"false"</constant>
         <constant name="useVssAsSecondWheelSpeed">"false"</constant>
         <constant name="is_enabled_spi_5">"false"</constant>
@@ -4649,7 +4651,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1449262508" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1090824188" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_MAVERICK_X3.msq b/simulator/generated/simulator_tune_MAVERICK_X3.msq
index c4fef59e9f..25462ce590 100644
--- a/simulator/generated/simulator_tune_MAVERICK_X3.msq
+++ b/simulator/generated/simulator_tune_MAVERICK_X3.msq
@@ -652,7 +652,7 @@
          1.2
 </constant>
         <constant name="vrThreshold2_pin">"NONE"</constant>
-        <constant name="gpPwmNote1">IC Fan</constant>
+        <constant name="gpPwmNote1">GPPWM0</constant>
         <constant name="gpPwmNote2">Acc Relay</constant>
         <constant name="gpPwmNote3">GPPWM2</constant>
         <constant name="gpPwmNote4">GPPWM3</constant>
@@ -799,6 +799,8 @@
         <constant name="luaCanRxWorkaround">"false"</constant>
         <constant name="flexSensorInverted">"false"</constant>
         <constant name="useHardSkipInTraction">"false"</constant>
+        <constant name="fancySmartS">"false"</constant>
+        <constant name="fancySmartL">"false"</constant>
         <constant name="useAuxSpeedForSlipRatio">"false"</constant>
         <constant name="useVssAsSecondWheelSpeed">"false"</constant>
         <constant name="is_enabled_spi_5">"false"</constant>
@@ -1171,7 +1173,7 @@
         <constant digits="0" name="disableFan1AtSpeed" units="">0.0</constant>
         <constant digits="0" name="disableFan2AtSpeed" units="">0.0</constant>
         <constant name="canVssNbcType">"BMW_e46"</constant>
-        <constant name="gppwm1_pin">"PE1"</constant>
+        <constant name="gppwm1_pin">"NONE"</constant>
         <constant digits="0" name="gppwm1_dutyIfError" units="%">100.0</constant>
         <constant digits="0" name="gppwm1_pwmFrequency" units="hz">0.0</constant>
         <constant digits="0" name="gppwm1_onAboveDuty" units="%">60.0</constant>
@@ -4556,7 +4558,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1449262508" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1090824188" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_MAZDA_MIATA_NA6.msq b/simulator/generated/simulator_tune_MAZDA_MIATA_NA6.msq
index a950c18663..2b01c6cb46 100644
--- a/simulator/generated/simulator_tune_MAZDA_MIATA_NA6.msq
+++ b/simulator/generated/simulator_tune_MAZDA_MIATA_NA6.msq
@@ -799,6 +799,8 @@
         <constant name="luaCanRxWorkaround">"false"</constant>
         <constant name="flexSensorInverted">"false"</constant>
         <constant name="useHardSkipInTraction">"false"</constant>
+        <constant name="fancySmartS">"false"</constant>
+        <constant name="fancySmartL">"false"</constant>
         <constant name="useAuxSpeedForSlipRatio">"false"</constant>
         <constant name="useVssAsSecondWheelSpeed">"false"</constant>
         <constant name="is_enabled_spi_5">"false"</constant>
@@ -4559,7 +4561,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1449262508" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1090824188" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_MAZDA_MIATA_NA94.msq b/simulator/generated/simulator_tune_MAZDA_MIATA_NA94.msq
index f368c0864b..dfa8128107 100644
--- a/simulator/generated/simulator_tune_MAZDA_MIATA_NA94.msq
+++ b/simulator/generated/simulator_tune_MAZDA_MIATA_NA94.msq
@@ -799,6 +799,8 @@
         <constant name="luaCanRxWorkaround">"false"</constant>
         <constant name="flexSensorInverted">"false"</constant>
         <constant name="useHardSkipInTraction">"false"</constant>
+        <constant name="fancySmartS">"false"</constant>
+        <constant name="fancySmartL">"false"</constant>
         <constant name="useAuxSpeedForSlipRatio">"false"</constant>
         <constant name="useVssAsSecondWheelSpeed">"false"</constant>
         <constant name="is_enabled_spi_5">"false"</constant>
@@ -4559,7 +4561,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1449262508" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1090824188" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_MAZDA_MIATA_NA96.msq b/simulator/generated/simulator_tune_MAZDA_MIATA_NA96.msq
index 90b3b00cba..a956de0597 100644
--- a/simulator/generated/simulator_tune_MAZDA_MIATA_NA96.msq
+++ b/simulator/generated/simulator_tune_MAZDA_MIATA_NA96.msq
@@ -799,6 +799,8 @@
         <constant name="luaCanRxWorkaround">"false"</constant>
         <constant name="flexSensorInverted">"false"</constant>
         <constant name="useHardSkipInTraction">"false"</constant>
+        <constant name="fancySmartS">"false"</constant>
+        <constant name="fancySmartL">"false"</constant>
         <constant name="useAuxSpeedForSlipRatio">"false"</constant>
         <constant name="useVssAsSecondWheelSpeed">"false"</constant>
         <constant name="is_enabled_spi_5">"false"</constant>
@@ -4559,7 +4561,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1449262508" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1090824188" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_MAZDA_MIATA_NB1.msq b/simulator/generated/simulator_tune_MAZDA_MIATA_NB1.msq
index 39b722a92e..5f037f8156 100644
--- a/simulator/generated/simulator_tune_MAZDA_MIATA_NB1.msq
+++ b/simulator/generated/simulator_tune_MAZDA_MIATA_NB1.msq
@@ -799,6 +799,8 @@
         <constant name="luaCanRxWorkaround">"false"</constant>
         <constant name="flexSensorInverted">"false"</constant>
         <constant name="useHardSkipInTraction">"false"</constant>
+        <constant name="fancySmartS">"false"</constant>
+        <constant name="fancySmartL">"false"</constant>
         <constant name="useAuxSpeedForSlipRatio">"false"</constant>
         <constant name="useVssAsSecondWheelSpeed">"false"</constant>
         <constant name="is_enabled_spi_5">"false"</constant>
@@ -4559,7 +4561,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1449262508" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1090824188" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_MAZDA_MIATA_NB2.msq b/simulator/generated/simulator_tune_MAZDA_MIATA_NB2.msq
index a2304274d6..0605ef6c35 100644
--- a/simulator/generated/simulator_tune_MAZDA_MIATA_NB2.msq
+++ b/simulator/generated/simulator_tune_MAZDA_MIATA_NB2.msq
@@ -800,6 +800,8 @@
         <constant name="luaCanRxWorkaround">"false"</constant>
         <constant name="flexSensorInverted">"false"</constant>
         <constant name="useHardSkipInTraction">"false"</constant>
+        <constant name="fancySmartS">"false"</constant>
+        <constant name="fancySmartL">"false"</constant>
         <constant name="useAuxSpeedForSlipRatio">"false"</constant>
         <constant name="useVssAsSecondWheelSpeed">"false"</constant>
         <constant name="is_enabled_spi_5">"false"</constant>
@@ -4560,7 +4562,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1449262508" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1090824188" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>
diff --git a/simulator/generated/simulator_tune_MERCEDES_M111.msq b/simulator/generated/simulator_tune_MERCEDES_M111.msq
index 72ef9b17c4..501f0287d8 100644
--- a/simulator/generated/simulator_tune_MERCEDES_M111.msq
+++ b/simulator/generated/simulator_tune_MERCEDES_M111.msq
@@ -799,6 +799,8 @@
         <constant name="luaCanRxWorkaround">"false"</constant>
         <constant name="flexSensorInverted">"false"</constant>
         <constant name="useHardSkipInTraction">"false"</constant>
+        <constant name="fancySmartS">"false"</constant>
+        <constant name="fancySmartL">"false"</constant>
         <constant name="useAuxSpeedForSlipRatio">"false"</constant>
         <constant name="useVssAsSecondWheelSpeed">"false"</constant>
         <constant name="is_enabled_spi_5">"false"</constant>
@@ -4559,7 +4561,7 @@ end</constant>
          7000.0
 </constant>
     </page>
-    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1449262508" version="5.0"/>
+    <versionInfo firmwareInfo="20240227" nPages="1" signature="rusEFI master.2024.03.14.f407-discovery.1090824188" version="5.0"/>
     <bibliography author="rusEFI 20240227" writeDate="date"/>
     <settings/>
     <userComments/>