diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h
index a55ed72ae5..0f94dfba08 100644
--- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h
+++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h
@@ -1,4 +1,4 @@
-// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Jun 15 21:32:10 UTC 2021
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jun 16 12:53:42 UTC 2021
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #pragma once
@@ -824,10 +824,17 @@ struct engine_configuration_s {
 	 */
 	float ignitionDwellForCrankingMs;
 	/**
-	deg
+	 * Once engine speed passes this value, start reducing ETB angle.
+	1
 	 * offset 104
 	 */
-	float unused104;
+	uint16_t etbRevLimitStart;
+	/**
+	 * This far above 'Soft limiter start', fully close the throttle. At the bottom of the range, throttle control is normal. At the top of the range, the throttle is fully closed.
+	1
+	 * offset 106
+	 */
+	uint16_t etbRevLimitRange;
 	/**
 	 * @see hasMapSensor
 	 * @see isMapAveragingEnabled
@@ -1957,10 +1964,10 @@ struct engine_configuration_s {
 	bool unusedBit_251_29 : 1;
 	/**
 	offset 976 bit 30 */
-	bool unusedBit_289_30 : 1;
+	bool unusedBit_290_30 : 1;
 	/**
 	offset 976 bit 31 */
-	bool unusedBit_289_31 : 1;
+	bool unusedBit_290_31 : 1;
 	/**
 	 * offset 980
 	 */
@@ -2889,76 +2896,76 @@ struct engine_configuration_s {
 	bool unused1130 : 1;
 	/**
 	offset 2116 bit 8 */
-	bool unusedBit_492_8 : 1;
+	bool unusedBit_493_8 : 1;
 	/**
 	offset 2116 bit 9 */
-	bool unusedBit_492_9 : 1;
+	bool unusedBit_493_9 : 1;
 	/**
 	offset 2116 bit 10 */
-	bool unusedBit_492_10 : 1;
+	bool unusedBit_493_10 : 1;
 	/**
 	offset 2116 bit 11 */
-	bool unusedBit_492_11 : 1;
+	bool unusedBit_493_11 : 1;
 	/**
 	offset 2116 bit 12 */
-	bool unusedBit_492_12 : 1;
+	bool unusedBit_493_12 : 1;
 	/**
 	offset 2116 bit 13 */
-	bool unusedBit_492_13 : 1;
+	bool unusedBit_493_13 : 1;
 	/**
 	offset 2116 bit 14 */
-	bool unusedBit_492_14 : 1;
+	bool unusedBit_493_14 : 1;
 	/**
 	offset 2116 bit 15 */
-	bool unusedBit_492_15 : 1;
+	bool unusedBit_493_15 : 1;
 	/**
 	offset 2116 bit 16 */
-	bool unusedBit_492_16 : 1;
+	bool unusedBit_493_16 : 1;
 	/**
 	offset 2116 bit 17 */
-	bool unusedBit_492_17 : 1;
+	bool unusedBit_493_17 : 1;
 	/**
 	offset 2116 bit 18 */
-	bool unusedBit_492_18 : 1;
+	bool unusedBit_493_18 : 1;
 	/**
 	offset 2116 bit 19 */
-	bool unusedBit_492_19 : 1;
+	bool unusedBit_493_19 : 1;
 	/**
 	offset 2116 bit 20 */
-	bool unusedBit_492_20 : 1;
+	bool unusedBit_493_20 : 1;
 	/**
 	offset 2116 bit 21 */
-	bool unusedBit_492_21 : 1;
+	bool unusedBit_493_21 : 1;
 	/**
 	offset 2116 bit 22 */
-	bool unusedBit_492_22 : 1;
+	bool unusedBit_493_22 : 1;
 	/**
 	offset 2116 bit 23 */
-	bool unusedBit_492_23 : 1;
+	bool unusedBit_493_23 : 1;
 	/**
 	offset 2116 bit 24 */
-	bool unusedBit_492_24 : 1;
+	bool unusedBit_493_24 : 1;
 	/**
 	offset 2116 bit 25 */
-	bool unusedBit_492_25 : 1;
+	bool unusedBit_493_25 : 1;
 	/**
 	offset 2116 bit 26 */
-	bool unusedBit_492_26 : 1;
+	bool unusedBit_493_26 : 1;
 	/**
 	offset 2116 bit 27 */
-	bool unusedBit_492_27 : 1;
+	bool unusedBit_493_27 : 1;
 	/**
 	offset 2116 bit 28 */
-	bool unusedBit_492_28 : 1;
+	bool unusedBit_493_28 : 1;
 	/**
 	offset 2116 bit 29 */
-	bool unusedBit_492_29 : 1;
+	bool unusedBit_493_29 : 1;
 	/**
 	offset 2116 bit 30 */
-	bool unusedBit_492_30 : 1;
+	bool unusedBit_493_30 : 1;
 	/**
 	offset 2116 bit 31 */
-	bool unusedBit_492_31 : 1;
+	bool unusedBit_493_31 : 1;
 	/**
 	 * set can_mode X
 	 * offset 2120
@@ -4212,4 +4219,4 @@ struct persistent_config_s {
 };
 
 // end
-// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Jun 15 21:32:10 UTC 2021
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jun 16 12:53:42 UTC 2021
diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h
index 7f449f229d..196b8f136d 100644
--- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h
+++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h
@@ -483,6 +483,8 @@
 #define etbIo2_disablePin_offset 987
 #define etbIo2_offset 984
 #define etbNeutralPosition_offset 1471
+#define etbRevLimitRange_offset 106
+#define etbRevLimitStart_offset 104
 #define etbWastegatePid_dFactor_offset 2524
 #define etbWastegatePid_iFactor_offset 2520
 #define etbWastegatePid_maxValue_offset 2534
@@ -1285,8 +1287,8 @@
 #define showHumanReadableWarning_offset 976
 #define showSdCardWarning_offset 76
 #define SIGNATURE_BOARD hellen_cypress
-#define SIGNATURE_DATE 2021.06.15
-#define SIGNATURE_HASH 3758236067
+#define SIGNATURE_DATE 2021.06.16
+#define SIGNATURE_HASH 657477637
 #define silentTriggerError_offset 1464
 #define slowAdcAlpha_offset 2088
 #define sparkDwellRpmBins_offset 332
@@ -1639,7 +1641,7 @@
 #define ts_show_spi true
 #define ts_show_trigger_comparator false
 #define ts_show_tunerstudio_port true
-#define TS_SIGNATURE "rusEFI 2021.06.15.hellen_cypress.3758236067"
+#define TS_SIGNATURE "rusEFI 2021.06.16.hellen_cypress.657477637"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't' // 0x74
@@ -1692,7 +1694,6 @@
 #define twoWireBatchInjection_offset 1476
 #define uart_device_e_auto_enum "UART_NONE", "UART_DEVICE_1", "UART_DEVICE_2", "UART_DEVICE_3", "UART_DEVICE_4"
 #define uartConsoleSerialSpeed_offset 2076
-#define unused104_offset 104
 #define unused1059_offset 3964
 #define unused1126_offset 2116
 #define unused1127_offset 2116
@@ -1737,33 +1738,33 @@
 #define unusedAtOldBoardConfigurationEnd_offset 1228
 #define unusedBit4_1476_offset 1476
 #define unusedBit_251_29_offset 976
-#define unusedBit_289_30_offset 976
-#define unusedBit_289_31_offset 976
+#define unusedBit_290_30_offset 976
+#define unusedBit_290_31_offset 976
 #define unusedBit_34_31_offset 76
-#define unusedBit_492_10_offset 2116
-#define unusedBit_492_11_offset 2116
-#define unusedBit_492_12_offset 2116
-#define unusedBit_492_13_offset 2116
-#define unusedBit_492_14_offset 2116
-#define unusedBit_492_15_offset 2116
-#define unusedBit_492_16_offset 2116
-#define unusedBit_492_17_offset 2116
-#define unusedBit_492_18_offset 2116
-#define unusedBit_492_19_offset 2116
-#define unusedBit_492_20_offset 2116
-#define unusedBit_492_21_offset 2116
-#define unusedBit_492_22_offset 2116
-#define unusedBit_492_23_offset 2116
-#define unusedBit_492_24_offset 2116
-#define unusedBit_492_25_offset 2116
-#define unusedBit_492_26_offset 2116
-#define unusedBit_492_27_offset 2116
-#define unusedBit_492_28_offset 2116
-#define unusedBit_492_29_offset 2116
-#define unusedBit_492_30_offset 2116
-#define unusedBit_492_31_offset 2116
-#define unusedBit_492_8_offset 2116
-#define unusedBit_492_9_offset 2116
+#define unusedBit_493_10_offset 2116
+#define unusedBit_493_11_offset 2116
+#define unusedBit_493_12_offset 2116
+#define unusedBit_493_13_offset 2116
+#define unusedBit_493_14_offset 2116
+#define unusedBit_493_15_offset 2116
+#define unusedBit_493_16_offset 2116
+#define unusedBit_493_17_offset 2116
+#define unusedBit_493_18_offset 2116
+#define unusedBit_493_19_offset 2116
+#define unusedBit_493_20_offset 2116
+#define unusedBit_493_21_offset 2116
+#define unusedBit_493_22_offset 2116
+#define unusedBit_493_23_offset 2116
+#define unusedBit_493_24_offset 2116
+#define unusedBit_493_25_offset 2116
+#define unusedBit_493_26_offset 2116
+#define unusedBit_493_27_offset 2116
+#define unusedBit_493_28_offset 2116
+#define unusedBit_493_29_offset 2116
+#define unusedBit_493_30_offset 2116
+#define unusedBit_493_31_offset 2116
+#define unusedBit_493_8_offset 2116
+#define unusedBit_493_9_offset 2116
 #define unusedOldBiquad_offset 2331
 #define unusedOldIgnitionOffset_offset 445
 #define unusedSpiPadding4_offset 2593
diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h
index 6d0ca9f7cc..2ffbb8309e 100644
--- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h
+++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h
@@ -1,4 +1,4 @@
-// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Jun 15 21:32:08 UTC 2021
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jun 16 12:53:41 UTC 2021
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #pragma once
@@ -824,10 +824,17 @@ struct engine_configuration_s {
 	 */
 	float ignitionDwellForCrankingMs;
 	/**
-	deg
+	 * Once engine speed passes this value, start reducing ETB angle.
+	1
 	 * offset 104
 	 */
-	float unused104;
+	uint16_t etbRevLimitStart;
+	/**
+	 * This far above 'Soft limiter start', fully close the throttle. At the bottom of the range, throttle control is normal. At the top of the range, the throttle is fully closed.
+	1
+	 * offset 106
+	 */
+	uint16_t etbRevLimitRange;
 	/**
 	 * @see hasMapSensor
 	 * @see isMapAveragingEnabled
@@ -1957,10 +1964,10 @@ struct engine_configuration_s {
 	bool unusedBit_251_29 : 1;
 	/**
 	offset 976 bit 30 */
-	bool unusedBit_289_30 : 1;
+	bool unusedBit_290_30 : 1;
 	/**
 	offset 976 bit 31 */
-	bool unusedBit_289_31 : 1;
+	bool unusedBit_290_31 : 1;
 	/**
 	 * offset 980
 	 */
@@ -2889,76 +2896,76 @@ struct engine_configuration_s {
 	bool unused1130 : 1;
 	/**
 	offset 2116 bit 8 */
-	bool unusedBit_492_8 : 1;
+	bool unusedBit_493_8 : 1;
 	/**
 	offset 2116 bit 9 */
-	bool unusedBit_492_9 : 1;
+	bool unusedBit_493_9 : 1;
 	/**
 	offset 2116 bit 10 */
-	bool unusedBit_492_10 : 1;
+	bool unusedBit_493_10 : 1;
 	/**
 	offset 2116 bit 11 */
-	bool unusedBit_492_11 : 1;
+	bool unusedBit_493_11 : 1;
 	/**
 	offset 2116 bit 12 */
-	bool unusedBit_492_12 : 1;
+	bool unusedBit_493_12 : 1;
 	/**
 	offset 2116 bit 13 */
-	bool unusedBit_492_13 : 1;
+	bool unusedBit_493_13 : 1;
 	/**
 	offset 2116 bit 14 */
-	bool unusedBit_492_14 : 1;
+	bool unusedBit_493_14 : 1;
 	/**
 	offset 2116 bit 15 */
-	bool unusedBit_492_15 : 1;
+	bool unusedBit_493_15 : 1;
 	/**
 	offset 2116 bit 16 */
-	bool unusedBit_492_16 : 1;
+	bool unusedBit_493_16 : 1;
 	/**
 	offset 2116 bit 17 */
-	bool unusedBit_492_17 : 1;
+	bool unusedBit_493_17 : 1;
 	/**
 	offset 2116 bit 18 */
-	bool unusedBit_492_18 : 1;
+	bool unusedBit_493_18 : 1;
 	/**
 	offset 2116 bit 19 */
-	bool unusedBit_492_19 : 1;
+	bool unusedBit_493_19 : 1;
 	/**
 	offset 2116 bit 20 */
-	bool unusedBit_492_20 : 1;
+	bool unusedBit_493_20 : 1;
 	/**
 	offset 2116 bit 21 */
-	bool unusedBit_492_21 : 1;
+	bool unusedBit_493_21 : 1;
 	/**
 	offset 2116 bit 22 */
-	bool unusedBit_492_22 : 1;
+	bool unusedBit_493_22 : 1;
 	/**
 	offset 2116 bit 23 */
-	bool unusedBit_492_23 : 1;
+	bool unusedBit_493_23 : 1;
 	/**
 	offset 2116 bit 24 */
-	bool unusedBit_492_24 : 1;
+	bool unusedBit_493_24 : 1;
 	/**
 	offset 2116 bit 25 */
-	bool unusedBit_492_25 : 1;
+	bool unusedBit_493_25 : 1;
 	/**
 	offset 2116 bit 26 */
-	bool unusedBit_492_26 : 1;
+	bool unusedBit_493_26 : 1;
 	/**
 	offset 2116 bit 27 */
-	bool unusedBit_492_27 : 1;
+	bool unusedBit_493_27 : 1;
 	/**
 	offset 2116 bit 28 */
-	bool unusedBit_492_28 : 1;
+	bool unusedBit_493_28 : 1;
 	/**
 	offset 2116 bit 29 */
-	bool unusedBit_492_29 : 1;
+	bool unusedBit_493_29 : 1;
 	/**
 	offset 2116 bit 30 */
-	bool unusedBit_492_30 : 1;
+	bool unusedBit_493_30 : 1;
 	/**
 	offset 2116 bit 31 */
-	bool unusedBit_492_31 : 1;
+	bool unusedBit_493_31 : 1;
 	/**
 	 * set can_mode X
 	 * offset 2120
@@ -4206,4 +4213,4 @@ struct persistent_config_s {
 };
 
 // end
-// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Jun 15 21:32:08 UTC 2021
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jun 16 12:53:41 UTC 2021
diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
index 0e45d15797..abdb7ebc62 100644
--- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
+++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
@@ -467,6 +467,8 @@
 #define etbIo2_disablePin_offset 987
 #define etbIo2_offset 984
 #define etbNeutralPosition_offset 1471
+#define etbRevLimitRange_offset 106
+#define etbRevLimitStart_offset 104
 #define etbWastegatePid_dFactor_offset 2516
 #define etbWastegatePid_iFactor_offset 2512
 #define etbWastegatePid_maxValue_offset 2526
@@ -1269,8 +1271,8 @@
 #define showHumanReadableWarning_offset 976
 #define showSdCardWarning_offset 76
 #define SIGNATURE_BOARD kin
-#define SIGNATURE_DATE 2021.06.15
-#define SIGNATURE_HASH 531098975
+#define SIGNATURE_DATE 2021.06.16
+#define SIGNATURE_HASH 3633683705
 #define silentTriggerError_offset 1464
 #define slowAdcAlpha_offset 2088
 #define sparkDwellRpmBins_offset 332
@@ -1623,7 +1625,7 @@
 #define ts_show_spi true
 #define ts_show_trigger_comparator true
 #define ts_show_tunerstudio_port true
-#define TS_SIGNATURE "rusEFI 2021.06.15.kin.531098975"
+#define TS_SIGNATURE "rusEFI 2021.06.16.kin.3633683705"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't' // 0x74
@@ -1676,7 +1678,6 @@
 #define twoWireBatchInjection_offset 1476
 #define uart_device_e_auto_enum "UART_NONE", "UART_DEVICE_1", "UART_DEVICE_2", "UART_DEVICE_3", "UART_DEVICE_4"
 #define uartConsoleSerialSpeed_offset 2076
-#define unused104_offset 104
 #define unused1059_offset 3936
 #define unused1126_offset 2116
 #define unused1127_offset 2116
@@ -1721,33 +1722,33 @@
 #define unusedAtOldBoardConfigurationEnd_offset 1228
 #define unusedBit4_1476_offset 1476
 #define unusedBit_251_29_offset 976
-#define unusedBit_289_30_offset 976
-#define unusedBit_289_31_offset 976
+#define unusedBit_290_30_offset 976
+#define unusedBit_290_31_offset 976
 #define unusedBit_34_31_offset 76
-#define unusedBit_492_10_offset 2116
-#define unusedBit_492_11_offset 2116
-#define unusedBit_492_12_offset 2116
-#define unusedBit_492_13_offset 2116
-#define unusedBit_492_14_offset 2116
-#define unusedBit_492_15_offset 2116
-#define unusedBit_492_16_offset 2116
-#define unusedBit_492_17_offset 2116
-#define unusedBit_492_18_offset 2116
-#define unusedBit_492_19_offset 2116
-#define unusedBit_492_20_offset 2116
-#define unusedBit_492_21_offset 2116
-#define unusedBit_492_22_offset 2116
-#define unusedBit_492_23_offset 2116
-#define unusedBit_492_24_offset 2116
-#define unusedBit_492_25_offset 2116
-#define unusedBit_492_26_offset 2116
-#define unusedBit_492_27_offset 2116
-#define unusedBit_492_28_offset 2116
-#define unusedBit_492_29_offset 2116
-#define unusedBit_492_30_offset 2116
-#define unusedBit_492_31_offset 2116
-#define unusedBit_492_8_offset 2116
-#define unusedBit_492_9_offset 2116
+#define unusedBit_493_10_offset 2116
+#define unusedBit_493_11_offset 2116
+#define unusedBit_493_12_offset 2116
+#define unusedBit_493_13_offset 2116
+#define unusedBit_493_14_offset 2116
+#define unusedBit_493_15_offset 2116
+#define unusedBit_493_16_offset 2116
+#define unusedBit_493_17_offset 2116
+#define unusedBit_493_18_offset 2116
+#define unusedBit_493_19_offset 2116
+#define unusedBit_493_20_offset 2116
+#define unusedBit_493_21_offset 2116
+#define unusedBit_493_22_offset 2116
+#define unusedBit_493_23_offset 2116
+#define unusedBit_493_24_offset 2116
+#define unusedBit_493_25_offset 2116
+#define unusedBit_493_26_offset 2116
+#define unusedBit_493_27_offset 2116
+#define unusedBit_493_28_offset 2116
+#define unusedBit_493_29_offset 2116
+#define unusedBit_493_30_offset 2116
+#define unusedBit_493_31_offset 2116
+#define unusedBit_493_8_offset 2116
+#define unusedBit_493_9_offset 2116
 #define unusedOldBiquad_offset 2323
 #define unusedOldIgnitionOffset_offset 445
 #define unusedSpiPadding4_offset 2585
diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h
index d5fe058657..7c963807c1 100644
--- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h
+++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h
@@ -1,4 +1,4 @@
-// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Tue Jun 15 21:32:11 UTC 2021
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Jun 16 12:53:43 UTC 2021
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #pragma once
@@ -824,10 +824,17 @@ struct engine_configuration_s {
 	 */
 	float ignitionDwellForCrankingMs;
 	/**
-	deg
+	 * Once engine speed passes this value, start reducing ETB angle.
+	1
 	 * offset 104
 	 */
-	float unused104;
+	uint16_t etbRevLimitStart;
+	/**
+	 * This far above 'Soft limiter start', fully close the throttle. At the bottom of the range, throttle control is normal. At the top of the range, the throttle is fully closed.
+	1
+	 * offset 106
+	 */
+	uint16_t etbRevLimitRange;
 	/**
 	 * @see hasMapSensor
 	 * @see isMapAveragingEnabled
@@ -1957,10 +1964,10 @@ struct engine_configuration_s {
 	bool unusedBit_251_29 : 1;
 	/**
 	offset 976 bit 30 */
-	bool unusedBit_289_30 : 1;
+	bool unusedBit_290_30 : 1;
 	/**
 	offset 976 bit 31 */
-	bool unusedBit_289_31 : 1;
+	bool unusedBit_290_31 : 1;
 	/**
 	 * offset 980
 	 */
@@ -2889,76 +2896,76 @@ struct engine_configuration_s {
 	bool unused1130 : 1;
 	/**
 	offset 2116 bit 8 */
-	bool unusedBit_492_8 : 1;
+	bool unusedBit_493_8 : 1;
 	/**
 	offset 2116 bit 9 */
-	bool unusedBit_492_9 : 1;
+	bool unusedBit_493_9 : 1;
 	/**
 	offset 2116 bit 10 */
-	bool unusedBit_492_10 : 1;
+	bool unusedBit_493_10 : 1;
 	/**
 	offset 2116 bit 11 */
-	bool unusedBit_492_11 : 1;
+	bool unusedBit_493_11 : 1;
 	/**
 	offset 2116 bit 12 */
-	bool unusedBit_492_12 : 1;
+	bool unusedBit_493_12 : 1;
 	/**
 	offset 2116 bit 13 */
-	bool unusedBit_492_13 : 1;
+	bool unusedBit_493_13 : 1;
 	/**
 	offset 2116 bit 14 */
-	bool unusedBit_492_14 : 1;
+	bool unusedBit_493_14 : 1;
 	/**
 	offset 2116 bit 15 */
-	bool unusedBit_492_15 : 1;
+	bool unusedBit_493_15 : 1;
 	/**
 	offset 2116 bit 16 */
-	bool unusedBit_492_16 : 1;
+	bool unusedBit_493_16 : 1;
 	/**
 	offset 2116 bit 17 */
-	bool unusedBit_492_17 : 1;
+	bool unusedBit_493_17 : 1;
 	/**
 	offset 2116 bit 18 */
-	bool unusedBit_492_18 : 1;
+	bool unusedBit_493_18 : 1;
 	/**
 	offset 2116 bit 19 */
-	bool unusedBit_492_19 : 1;
+	bool unusedBit_493_19 : 1;
 	/**
 	offset 2116 bit 20 */
-	bool unusedBit_492_20 : 1;
+	bool unusedBit_493_20 : 1;
 	/**
 	offset 2116 bit 21 */
-	bool unusedBit_492_21 : 1;
+	bool unusedBit_493_21 : 1;
 	/**
 	offset 2116 bit 22 */
-	bool unusedBit_492_22 : 1;
+	bool unusedBit_493_22 : 1;
 	/**
 	offset 2116 bit 23 */
-	bool unusedBit_492_23 : 1;
+	bool unusedBit_493_23 : 1;
 	/**
 	offset 2116 bit 24 */
-	bool unusedBit_492_24 : 1;
+	bool unusedBit_493_24 : 1;
 	/**
 	offset 2116 bit 25 */
-	bool unusedBit_492_25 : 1;
+	bool unusedBit_493_25 : 1;
 	/**
 	offset 2116 bit 26 */
-	bool unusedBit_492_26 : 1;
+	bool unusedBit_493_26 : 1;
 	/**
 	offset 2116 bit 27 */
-	bool unusedBit_492_27 : 1;
+	bool unusedBit_493_27 : 1;
 	/**
 	offset 2116 bit 28 */
-	bool unusedBit_492_28 : 1;
+	bool unusedBit_493_28 : 1;
 	/**
 	offset 2116 bit 29 */
-	bool unusedBit_492_29 : 1;
+	bool unusedBit_493_29 : 1;
 	/**
 	offset 2116 bit 30 */
-	bool unusedBit_492_30 : 1;
+	bool unusedBit_493_30 : 1;
 	/**
 	offset 2116 bit 31 */
-	bool unusedBit_492_31 : 1;
+	bool unusedBit_493_31 : 1;
 	/**
 	 * set can_mode X
 	 * offset 2120
@@ -4212,4 +4219,4 @@ struct persistent_config_s {
 };
 
 // end
-// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Tue Jun 15 21:32:11 UTC 2021
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Jun 16 12:53:43 UTC 2021
diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h
index 307bd28266..232c21e558 100644
--- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h
+++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h
@@ -483,6 +483,8 @@
 #define etbIo2_disablePin_offset 987
 #define etbIo2_offset 984
 #define etbNeutralPosition_offset 1471
+#define etbRevLimitRange_offset 106
+#define etbRevLimitStart_offset 104
 #define etbWastegatePid_dFactor_offset 2524
 #define etbWastegatePid_iFactor_offset 2520
 #define etbWastegatePid_maxValue_offset 2534
@@ -1285,8 +1287,8 @@
 #define showHumanReadableWarning_offset 976
 #define showSdCardWarning_offset 76
 #define SIGNATURE_BOARD subaru_eg33_f7
-#define SIGNATURE_DATE 2021.06.15
-#define SIGNATURE_HASH 253949029
+#define SIGNATURE_DATE 2021.06.16
+#define SIGNATURE_HASH 3356526019
 #define silentTriggerError_offset 1464
 #define slowAdcAlpha_offset 2088
 #define sparkDwellRpmBins_offset 332
@@ -1639,7 +1641,7 @@
 #define ts_show_spi true
 #define ts_show_trigger_comparator false
 #define ts_show_tunerstudio_port false
-#define TS_SIGNATURE "rusEFI 2021.06.15.subaru_eg33_f7.253949029"
+#define TS_SIGNATURE "rusEFI 2021.06.16.subaru_eg33_f7.3356526019"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't' // 0x74
@@ -1692,7 +1694,6 @@
 #define twoWireBatchInjection_offset 1476
 #define uart_device_e_auto_enum "UART_NONE", "UART_DEVICE_1", "UART_DEVICE_2", "UART_DEVICE_3", "UART_DEVICE_4"
 #define uartConsoleSerialSpeed_offset 2076
-#define unused104_offset 104
 #define unused1059_offset 3964
 #define unused1126_offset 2116
 #define unused1127_offset 2116
@@ -1737,33 +1738,33 @@
 #define unusedAtOldBoardConfigurationEnd_offset 1228
 #define unusedBit4_1476_offset 1476
 #define unusedBit_251_29_offset 976
-#define unusedBit_289_30_offset 976
-#define unusedBit_289_31_offset 976
+#define unusedBit_290_30_offset 976
+#define unusedBit_290_31_offset 976
 #define unusedBit_34_31_offset 76
-#define unusedBit_492_10_offset 2116
-#define unusedBit_492_11_offset 2116
-#define unusedBit_492_12_offset 2116
-#define unusedBit_492_13_offset 2116
-#define unusedBit_492_14_offset 2116
-#define unusedBit_492_15_offset 2116
-#define unusedBit_492_16_offset 2116
-#define unusedBit_492_17_offset 2116
-#define unusedBit_492_18_offset 2116
-#define unusedBit_492_19_offset 2116
-#define unusedBit_492_20_offset 2116
-#define unusedBit_492_21_offset 2116
-#define unusedBit_492_22_offset 2116
-#define unusedBit_492_23_offset 2116
-#define unusedBit_492_24_offset 2116
-#define unusedBit_492_25_offset 2116
-#define unusedBit_492_26_offset 2116
-#define unusedBit_492_27_offset 2116
-#define unusedBit_492_28_offset 2116
-#define unusedBit_492_29_offset 2116
-#define unusedBit_492_30_offset 2116
-#define unusedBit_492_31_offset 2116
-#define unusedBit_492_8_offset 2116
-#define unusedBit_492_9_offset 2116
+#define unusedBit_493_10_offset 2116
+#define unusedBit_493_11_offset 2116
+#define unusedBit_493_12_offset 2116
+#define unusedBit_493_13_offset 2116
+#define unusedBit_493_14_offset 2116
+#define unusedBit_493_15_offset 2116
+#define unusedBit_493_16_offset 2116
+#define unusedBit_493_17_offset 2116
+#define unusedBit_493_18_offset 2116
+#define unusedBit_493_19_offset 2116
+#define unusedBit_493_20_offset 2116
+#define unusedBit_493_21_offset 2116
+#define unusedBit_493_22_offset 2116
+#define unusedBit_493_23_offset 2116
+#define unusedBit_493_24_offset 2116
+#define unusedBit_493_25_offset 2116
+#define unusedBit_493_26_offset 2116
+#define unusedBit_493_27_offset 2116
+#define unusedBit_493_28_offset 2116
+#define unusedBit_493_29_offset 2116
+#define unusedBit_493_30_offset 2116
+#define unusedBit_493_31_offset 2116
+#define unusedBit_493_8_offset 2116
+#define unusedBit_493_9_offset 2116
 #define unusedOldBiquad_offset 2331
 #define unusedOldIgnitionOffset_offset 445
 #define unusedSpiPadding4_offset 2593
diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h
index c1c474eedf..71e6b8568e 100644
--- a/firmware/controllers/generated/engine_configuration_generated_structures.h
+++ b/firmware/controllers/generated/engine_configuration_generated_structures.h
@@ -1,4 +1,4 @@
-// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 15 21:31:42 UTC 2021
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 12:53:19 UTC 2021
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #pragma once
@@ -824,10 +824,17 @@ struct engine_configuration_s {
 	 */
 	float ignitionDwellForCrankingMs;
 	/**
-	deg
+	 * Once engine speed passes this value, start reducing ETB angle.
+	1
 	 * offset 104
 	 */
-	float unused104;
+	uint16_t etbRevLimitStart;
+	/**
+	 * This far above 'Soft limiter start', fully close the throttle. At the bottom of the range, throttle control is normal. At the top of the range, the throttle is fully closed.
+	1
+	 * offset 106
+	 */
+	uint16_t etbRevLimitRange;
 	/**
 	 * @see hasMapSensor
 	 * @see isMapAveragingEnabled
@@ -1957,10 +1964,10 @@ struct engine_configuration_s {
 	bool unusedBit_251_29 : 1;
 	/**
 	offset 976 bit 30 */
-	bool unusedBit_289_30 : 1;
+	bool unusedBit_290_30 : 1;
 	/**
 	offset 976 bit 31 */
-	bool unusedBit_289_31 : 1;
+	bool unusedBit_290_31 : 1;
 	/**
 	 * offset 980
 	 */
@@ -2889,76 +2896,76 @@ struct engine_configuration_s {
 	bool unused1130 : 1;
 	/**
 	offset 2116 bit 8 */
-	bool unusedBit_492_8 : 1;
+	bool unusedBit_493_8 : 1;
 	/**
 	offset 2116 bit 9 */
-	bool unusedBit_492_9 : 1;
+	bool unusedBit_493_9 : 1;
 	/**
 	offset 2116 bit 10 */
-	bool unusedBit_492_10 : 1;
+	bool unusedBit_493_10 : 1;
 	/**
 	offset 2116 bit 11 */
-	bool unusedBit_492_11 : 1;
+	bool unusedBit_493_11 : 1;
 	/**
 	offset 2116 bit 12 */
-	bool unusedBit_492_12 : 1;
+	bool unusedBit_493_12 : 1;
 	/**
 	offset 2116 bit 13 */
-	bool unusedBit_492_13 : 1;
+	bool unusedBit_493_13 : 1;
 	/**
 	offset 2116 bit 14 */
-	bool unusedBit_492_14 : 1;
+	bool unusedBit_493_14 : 1;
 	/**
 	offset 2116 bit 15 */
-	bool unusedBit_492_15 : 1;
+	bool unusedBit_493_15 : 1;
 	/**
 	offset 2116 bit 16 */
-	bool unusedBit_492_16 : 1;
+	bool unusedBit_493_16 : 1;
 	/**
 	offset 2116 bit 17 */
-	bool unusedBit_492_17 : 1;
+	bool unusedBit_493_17 : 1;
 	/**
 	offset 2116 bit 18 */
-	bool unusedBit_492_18 : 1;
+	bool unusedBit_493_18 : 1;
 	/**
 	offset 2116 bit 19 */
-	bool unusedBit_492_19 : 1;
+	bool unusedBit_493_19 : 1;
 	/**
 	offset 2116 bit 20 */
-	bool unusedBit_492_20 : 1;
+	bool unusedBit_493_20 : 1;
 	/**
 	offset 2116 bit 21 */
-	bool unusedBit_492_21 : 1;
+	bool unusedBit_493_21 : 1;
 	/**
 	offset 2116 bit 22 */
-	bool unusedBit_492_22 : 1;
+	bool unusedBit_493_22 : 1;
 	/**
 	offset 2116 bit 23 */
-	bool unusedBit_492_23 : 1;
+	bool unusedBit_493_23 : 1;
 	/**
 	offset 2116 bit 24 */
-	bool unusedBit_492_24 : 1;
+	bool unusedBit_493_24 : 1;
 	/**
 	offset 2116 bit 25 */
-	bool unusedBit_492_25 : 1;
+	bool unusedBit_493_25 : 1;
 	/**
 	offset 2116 bit 26 */
-	bool unusedBit_492_26 : 1;
+	bool unusedBit_493_26 : 1;
 	/**
 	offset 2116 bit 27 */
-	bool unusedBit_492_27 : 1;
+	bool unusedBit_493_27 : 1;
 	/**
 	offset 2116 bit 28 */
-	bool unusedBit_492_28 : 1;
+	bool unusedBit_493_28 : 1;
 	/**
 	offset 2116 bit 29 */
-	bool unusedBit_492_29 : 1;
+	bool unusedBit_493_29 : 1;
 	/**
 	offset 2116 bit 30 */
-	bool unusedBit_492_30 : 1;
+	bool unusedBit_493_30 : 1;
 	/**
 	offset 2116 bit 31 */
-	bool unusedBit_492_31 : 1;
+	bool unusedBit_493_31 : 1;
 	/**
 	 * set can_mode X
 	 * offset 2120
@@ -4212,4 +4219,4 @@ struct persistent_config_s {
 };
 
 // end
-// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 15 21:31:42 UTC 2021
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 12:53:19 UTC 2021
diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def
index 4c80558710..378ddf2e11 100644
--- a/firmware/controllers/generated/fsio_enums_generated.def
+++ b/firmware/controllers/generated/fsio_enums_generated.def
@@ -1,4 +1,4 @@
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 15 21:31:42 UTC 2021
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 12:53:19 UTC 2021
 
 // by class com.rusefi.output.FileFsioSettingsConsumer
 	FSIO_SETTING_ACIDLEEXTRAOFFSET = 1000,
diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def
index b47f7070b5..0da7ebaffb 100644
--- a/firmware/controllers/generated/fsio_getters.def
+++ b/firmware/controllers/generated/fsio_getters.def
@@ -1,4 +1,4 @@
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 15 21:31:42 UTC 2021
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 12:53:19 UTC 2021
 
 // by class com.rusefi.output.FileFsioSettingsConsumer
 	case FSIO_SETTING_ACIDLEEXTRAOFFSET:
diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def
index 79d7f93a61..b5187283a5 100644
--- a/firmware/controllers/generated/fsio_names.def
+++ b/firmware/controllers/generated/fsio_names.def
@@ -1,4 +1,4 @@
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 15 21:31:42 UTC 2021
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 12:53:19 UTC 2021
 
 // by class com.rusefi.output.FileFsioSettingsConsumer
 static LENameOrdinalPair leacIdleExtraOffset(FSIO_SETTING_ACIDLEEXTRAOFFSET, "cfg_acIdleExtraOffset");
diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def
index ca4c881994..8d10b3f1e7 100644
--- a/firmware/controllers/generated/fsio_strings.def
+++ b/firmware/controllers/generated/fsio_strings.def
@@ -1,4 +1,4 @@
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 15 21:31:42 UTC 2021
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 12:53:19 UTC 2021
 
 // by class com.rusefi.output.FileFsioSettingsConsumer
 	case FSIO_SETTING_ACIDLEEXTRAOFFSET:
diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h
index d87c27b68e..fedb3cf8a6 100644
--- a/firmware/controllers/generated/rusefi_generated.h
+++ b/firmware/controllers/generated/rusefi_generated.h
@@ -481,6 +481,8 @@
 #define etbIo2_disablePin_offset 987
 #define etbIo2_offset 984
 #define etbNeutralPosition_offset 1471
+#define etbRevLimitRange_offset 106
+#define etbRevLimitStart_offset 104
 #define etbWastegatePid_dFactor_offset 2524
 #define etbWastegatePid_iFactor_offset 2520
 #define etbWastegatePid_maxValue_offset 2534
@@ -1282,8 +1284,8 @@
 #define showHumanReadableWarning_offset 976
 #define showSdCardWarning_offset 76
 #define SIGNATURE_BOARD all
-#define SIGNATURE_DATE 2021.06.15
-#define SIGNATURE_HASH 2726230643
+#define SIGNATURE_DATE 2021.06.16
+#define SIGNATURE_HASH 1699515349
 #define silentTriggerError_offset 1464
 #define slowAdcAlpha_offset 2088
 #define sparkDwellRpmBins_offset 332
@@ -1636,7 +1638,7 @@
 #define ts_show_spi true
 #define ts_show_trigger_comparator false
 #define ts_show_tunerstudio_port true
-#define TS_SIGNATURE "rusEFI 2021.06.15.all.2726230643"
+#define TS_SIGNATURE "rusEFI 2021.06.16.all.1699515349"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't' // 0x74
@@ -1689,7 +1691,6 @@
 #define twoWireBatchInjection_offset 1476
 #define uart_device_e_auto_enum "UART_NONE", "UART_DEVICE_1", "UART_DEVICE_2", "UART_DEVICE_3", "UART_DEVICE_4"
 #define uartConsoleSerialSpeed_offset 2076
-#define unused104_offset 104
 #define unused1059_offset 3964
 #define unused1126_offset 2116
 #define unused1127_offset 2116
@@ -1734,33 +1735,33 @@
 #define unusedAtOldBoardConfigurationEnd_offset 1228
 #define unusedBit4_1476_offset 1476
 #define unusedBit_251_29_offset 976
-#define unusedBit_289_30_offset 976
-#define unusedBit_289_31_offset 976
+#define unusedBit_290_30_offset 976
+#define unusedBit_290_31_offset 976
 #define unusedBit_34_31_offset 76
-#define unusedBit_492_10_offset 2116
-#define unusedBit_492_11_offset 2116
-#define unusedBit_492_12_offset 2116
-#define unusedBit_492_13_offset 2116
-#define unusedBit_492_14_offset 2116
-#define unusedBit_492_15_offset 2116
-#define unusedBit_492_16_offset 2116
-#define unusedBit_492_17_offset 2116
-#define unusedBit_492_18_offset 2116
-#define unusedBit_492_19_offset 2116
-#define unusedBit_492_20_offset 2116
-#define unusedBit_492_21_offset 2116
-#define unusedBit_492_22_offset 2116
-#define unusedBit_492_23_offset 2116
-#define unusedBit_492_24_offset 2116
-#define unusedBit_492_25_offset 2116
-#define unusedBit_492_26_offset 2116
-#define unusedBit_492_27_offset 2116
-#define unusedBit_492_28_offset 2116
-#define unusedBit_492_29_offset 2116
-#define unusedBit_492_30_offset 2116
-#define unusedBit_492_31_offset 2116
-#define unusedBit_492_8_offset 2116
-#define unusedBit_492_9_offset 2116
+#define unusedBit_493_10_offset 2116
+#define unusedBit_493_11_offset 2116
+#define unusedBit_493_12_offset 2116
+#define unusedBit_493_13_offset 2116
+#define unusedBit_493_14_offset 2116
+#define unusedBit_493_15_offset 2116
+#define unusedBit_493_16_offset 2116
+#define unusedBit_493_17_offset 2116
+#define unusedBit_493_18_offset 2116
+#define unusedBit_493_19_offset 2116
+#define unusedBit_493_20_offset 2116
+#define unusedBit_493_21_offset 2116
+#define unusedBit_493_22_offset 2116
+#define unusedBit_493_23_offset 2116
+#define unusedBit_493_24_offset 2116
+#define unusedBit_493_25_offset 2116
+#define unusedBit_493_26_offset 2116
+#define unusedBit_493_27_offset 2116
+#define unusedBit_493_28_offset 2116
+#define unusedBit_493_29_offset 2116
+#define unusedBit_493_30_offset 2116
+#define unusedBit_493_31_offset 2116
+#define unusedBit_493_8_offset 2116
+#define unusedBit_493_9_offset 2116
 #define unusedOldBiquad_offset 2331
 #define unusedOldIgnitionOffset_offset 445
 #define unusedSpiPadding4_offset 2593
diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h
index 963e7b0a64..aaa9eba9a4 100644
--- a/firmware/controllers/generated/signature_all.h
+++ b/firmware/controllers/generated/signature_all.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD all
-#define SIGNATURE_DATE 2021.06.15
-#define SIGNATURE_HASH 2726230643
-#define TS_SIGNATURE "rusEFI 2021.06.15.all.2726230643"
+#define SIGNATURE_DATE 2021.06.16
+#define SIGNATURE_HASH 1699515349
+#define TS_SIGNATURE "rusEFI 2021.06.16.all.1699515349"
diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h
index 5634f0292b..ff3dfd2a43 100644
--- a/firmware/controllers/generated/signature_frankenso_na6.h
+++ b/firmware/controllers/generated/signature_frankenso_na6.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD frankenso_na6
-#define SIGNATURE_DATE 2021.06.15
-#define SIGNATURE_HASH 2586866762
-#define TS_SIGNATURE "rusEFI 2021.06.15.frankenso_na6.2586866762"
+#define SIGNATURE_DATE 2021.06.16
+#define SIGNATURE_HASH 1560413676
+#define TS_SIGNATURE "rusEFI 2021.06.16.frankenso_na6.1560413676"
diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h
index c8488e0f2e..0339f2bed5 100644
--- a/firmware/controllers/generated/signature_hellen121nissan.h
+++ b/firmware/controllers/generated/signature_hellen121nissan.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD hellen121nissan
-#define SIGNATURE_DATE 2021.06.15
-#define SIGNATURE_HASH 1780118080
-#define TS_SIGNATURE "rusEFI 2021.06.15.hellen121nissan.1780118080"
+#define SIGNATURE_DATE 2021.06.16
+#define SIGNATURE_HASH 2905080806
+#define TS_SIGNATURE "rusEFI 2021.06.16.hellen121nissan.2905080806"
diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h
index b49f19d286..fe14f7760d 100644
--- a/firmware/controllers/generated/signature_hellen121vag.h
+++ b/firmware/controllers/generated/signature_hellen121vag.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD hellen121vag
-#define SIGNATURE_DATE 2021.06.15
-#define SIGNATURE_HASH 3092364949
-#define TS_SIGNATURE "rusEFI 2021.06.15.hellen121vag.3092364949"
+#define SIGNATURE_DATE 2021.06.16
+#define SIGNATURE_HASH 2137247539
+#define TS_SIGNATURE "rusEFI 2021.06.16.hellen121vag.2137247539"
diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h
index f55bba6725..cbecaa6d62 100644
--- a/firmware/controllers/generated/signature_hellen128.h
+++ b/firmware/controllers/generated/signature_hellen128.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD hellen128
-#define SIGNATURE_DATE 2021.06.15
-#define SIGNATURE_HASH 1434513047
-#define TS_SIGNATURE "rusEFI 2021.06.15.hellen128.1434513047"
+#define SIGNATURE_DATE 2021.06.16
+#define SIGNATURE_HASH 2461179697
+#define TS_SIGNATURE "rusEFI 2021.06.16.hellen128.2461179697"
diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h
index 8f964dd5b3..a3d9c521f2 100644
--- a/firmware/controllers/generated/signature_hellen72.h
+++ b/firmware/controllers/generated/signature_hellen72.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD hellen72
-#define SIGNATURE_DATE 2021.06.15
-#define SIGNATURE_HASH 210241016
-#define TS_SIGNATURE "rusEFI 2021.06.15.hellen72.210241016"
+#define SIGNATURE_DATE 2021.06.16
+#define SIGNATURE_HASH 3417994334
+#define TS_SIGNATURE "rusEFI 2021.06.16.hellen72.3417994334"
diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h
index f6c57a0089..d9e3159b09 100644
--- a/firmware/controllers/generated/signature_hellenNA6.h
+++ b/firmware/controllers/generated/signature_hellenNA6.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD hellenNA6
-#define SIGNATURE_DATE 2021.06.15
-#define SIGNATURE_HASH 617836873
-#define TS_SIGNATURE "rusEFI 2021.06.15.hellenNA6.617836873"
+#define SIGNATURE_DATE 2021.06.16
+#define SIGNATURE_HASH 3823173871
+#define TS_SIGNATURE "rusEFI 2021.06.16.hellenNA6.3823173871"
diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h
index 3fb4ed99ca..42cc58d366 100644
--- a/firmware/controllers/generated/signature_hellen_cypress.h
+++ b/firmware/controllers/generated/signature_hellen_cypress.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD hellen_cypress
-#define SIGNATURE_DATE 2021.06.15
-#define SIGNATURE_HASH 3758236067
-#define TS_SIGNATURE "rusEFI 2021.06.15.hellen_cypress.3758236067"
+#define SIGNATURE_DATE 2021.06.16
+#define SIGNATURE_HASH 657477637
+#define TS_SIGNATURE "rusEFI 2021.06.16.hellen_cypress.657477637"
diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h
index 09638234bf..088090f11e 100644
--- a/firmware/controllers/generated/signature_kin.h
+++ b/firmware/controllers/generated/signature_kin.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD kin
-#define SIGNATURE_DATE 2021.06.15
-#define SIGNATURE_HASH 531098975
-#define TS_SIGNATURE "rusEFI 2021.06.15.kin.531098975"
+#define SIGNATURE_DATE 2021.06.16
+#define SIGNATURE_HASH 3633683705
+#define TS_SIGNATURE "rusEFI 2021.06.16.kin.3633683705"
diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h
index 2a30b8f711..817a4d0002 100644
--- a/firmware/controllers/generated/signature_mre_f4.h
+++ b/firmware/controllers/generated/signature_mre_f4.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD mre_f4
-#define SIGNATURE_DATE 2021.06.15
-#define SIGNATURE_HASH 548168553
-#define TS_SIGNATURE "rusEFI 2021.06.15.mre_f4.548168553"
+#define SIGNATURE_DATE 2021.06.16
+#define SIGNATURE_HASH 3885896399
+#define TS_SIGNATURE "rusEFI 2021.06.16.mre_f4.3885896399"
diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h
index 8d4b76ea5a..1213a4713a 100644
--- a/firmware/controllers/generated/signature_mre_f7.h
+++ b/firmware/controllers/generated/signature_mre_f7.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD mre_f7
-#define SIGNATURE_DATE 2021.06.15
-#define SIGNATURE_HASH 548168553
-#define TS_SIGNATURE "rusEFI 2021.06.15.mre_f7.548168553"
+#define SIGNATURE_DATE 2021.06.16
+#define SIGNATURE_HASH 3885896399
+#define TS_SIGNATURE "rusEFI 2021.06.16.mre_f7.3885896399"
diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h
index 39ed53f7ea..95629c77fe 100644
--- a/firmware/controllers/generated/signature_prometheus_405.h
+++ b/firmware/controllers/generated/signature_prometheus_405.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD prometheus_405
-#define SIGNATURE_DATE 2021.06.15
-#define SIGNATURE_HASH 2968057925
-#define TS_SIGNATURE "rusEFI 2021.06.15.prometheus_405.2968057925"
+#define SIGNATURE_DATE 2021.06.16
+#define SIGNATURE_HASH 2010810851
+#define TS_SIGNATURE "rusEFI 2021.06.16.prometheus_405.2010810851"
diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h
index 6738f2beb2..b3a9c0e9aa 100644
--- a/firmware/controllers/generated/signature_prometheus_469.h
+++ b/firmware/controllers/generated/signature_prometheus_469.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD prometheus_469
-#define SIGNATURE_DATE 2021.06.15
-#define SIGNATURE_HASH 2968057925
-#define TS_SIGNATURE "rusEFI 2021.06.15.prometheus_469.2968057925"
+#define SIGNATURE_DATE 2021.06.16
+#define SIGNATURE_HASH 2010810851
+#define TS_SIGNATURE "rusEFI 2021.06.16.prometheus_469.2010810851"
diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h
index 6ec120b218..e75d5851b1 100644
--- a/firmware/controllers/generated/signature_proteus_f4.h
+++ b/firmware/controllers/generated/signature_proteus_f4.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD proteus_f4
-#define SIGNATURE_DATE 2021.06.15
-#define SIGNATURE_HASH 3418900328
-#define TS_SIGNATURE "rusEFI 2021.06.15.proteus_f4.3418900328"
+#define SIGNATURE_DATE 2021.06.16
+#define SIGNATURE_HASH 217724622
+#define TS_SIGNATURE "rusEFI 2021.06.16.proteus_f4.217724622"
diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h
index 255a588049..2f0120ef14 100644
--- a/firmware/controllers/generated/signature_proteus_f7.h
+++ b/firmware/controllers/generated/signature_proteus_f7.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD proteus_f7
-#define SIGNATURE_DATE 2021.06.15
-#define SIGNATURE_HASH 3418900328
-#define TS_SIGNATURE "rusEFI 2021.06.15.proteus_f7.3418900328"
+#define SIGNATURE_DATE 2021.06.16
+#define SIGNATURE_HASH 217724622
+#define TS_SIGNATURE "rusEFI 2021.06.16.proteus_f7.217724622"
diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h
index 95e0e97dce..7c9e1a8cdd 100644
--- a/firmware/controllers/generated/signature_subaru_eg33_f7.h
+++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD subaru_eg33_f7
-#define SIGNATURE_DATE 2021.06.15
-#define SIGNATURE_HASH 253949029
-#define TS_SIGNATURE "rusEFI 2021.06.15.subaru_eg33_f7.253949029"
+#define SIGNATURE_DATE 2021.06.16
+#define SIGNATURE_HASH 3356526019
+#define TS_SIGNATURE "rusEFI 2021.06.16.subaru_eg33_f7.3356526019"
diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip
index 5dc1805e5b..794ebdb641 100644
Binary files a/firmware/tunerstudio/generated/cache.zip and b/firmware/tunerstudio/generated/cache.zip differ
diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini
index f0ede564b5..8b5a16c330 100644
--- a/firmware/tunerstudio/generated/rusefi.ini
+++ b/firmware/tunerstudio/generated/rusefi.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.06.15.all.2726230643"
+ 	signature    = "rusEFI 2021.06.16.all.1699515349"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.06.15.all.2726230643" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.06.16.all.1699515349" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -77,7 +77,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 15 21:31:42 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 12:53:19 UTC 2021
 
 pageSize            = 20000
 page = 1
@@ -127,7 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0
 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0
 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1
 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1
-unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0
+etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0
+etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0
 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2
 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2
 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2
@@ -566,8 +567,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2"
 knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2"
 tcuEnabled = bits, U32, 976, [28:28], "false", "true"
 unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true"
-unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true"
-unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true"
+unusedBit_290_30 = bits, U32, 976, [30:30], "false", "true"
+unusedBit_290_31 = bits, U32, 976, [31:31], "false", "true"
 etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -855,30 +856,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true"
 unused1128 = bits, U32, 2116, [5:5], "false", "true"
 unused1129 = bits, U32, 2116, [6:6], "false", "true"
 unused1130 = bits, U32, 2116, [7:7], "false", "true"
-unusedBit_492_8 = bits, U32, 2116, [8:8], "false", "true"
-unusedBit_492_9 = bits, U32, 2116, [9:9], "false", "true"
-unusedBit_492_10 = bits, U32, 2116, [10:10], "false", "true"
-unusedBit_492_11 = bits, U32, 2116, [11:11], "false", "true"
-unusedBit_492_12 = bits, U32, 2116, [12:12], "false", "true"
-unusedBit_492_13 = bits, U32, 2116, [13:13], "false", "true"
-unusedBit_492_14 = bits, U32, 2116, [14:14], "false", "true"
-unusedBit_492_15 = bits, U32, 2116, [15:15], "false", "true"
-unusedBit_492_16 = bits, U32, 2116, [16:16], "false", "true"
-unusedBit_492_17 = bits, U32, 2116, [17:17], "false", "true"
-unusedBit_492_18 = bits, U32, 2116, [18:18], "false", "true"
-unusedBit_492_19 = bits, U32, 2116, [19:19], "false", "true"
-unusedBit_492_20 = bits, U32, 2116, [20:20], "false", "true"
-unusedBit_492_21 = bits, U32, 2116, [21:21], "false", "true"
-unusedBit_492_22 = bits, U32, 2116, [22:22], "false", "true"
-unusedBit_492_23 = bits, U32, 2116, [23:23], "false", "true"
-unusedBit_492_24 = bits, U32, 2116, [24:24], "false", "true"
-unusedBit_492_25 = bits, U32, 2116, [25:25], "false", "true"
-unusedBit_492_26 = bits, U32, 2116, [26:26], "false", "true"
-unusedBit_492_27 = bits, U32, 2116, [27:27], "false", "true"
-unusedBit_492_28 = bits, U32, 2116, [28:28], "false", "true"
-unusedBit_492_29 = bits, U32, 2116, [29:29], "false", "true"
-unusedBit_492_30 = bits, U32, 2116, [30:30], "false", "true"
-unusedBit_492_31 = bits, U32, 2116, [31:31], "false", "true"
+unusedBit_493_8 = bits, U32, 2116, [8:8], "false", "true"
+unusedBit_493_9 = bits, U32, 2116, [9:9], "false", "true"
+unusedBit_493_10 = bits, U32, 2116, [10:10], "false", "true"
+unusedBit_493_11 = bits, U32, 2116, [11:11], "false", "true"
+unusedBit_493_12 = bits, U32, 2116, [12:12], "false", "true"
+unusedBit_493_13 = bits, U32, 2116, [13:13], "false", "true"
+unusedBit_493_14 = bits, U32, 2116, [14:14], "false", "true"
+unusedBit_493_15 = bits, U32, 2116, [15:15], "false", "true"
+unusedBit_493_16 = bits, U32, 2116, [16:16], "false", "true"
+unusedBit_493_17 = bits, U32, 2116, [17:17], "false", "true"
+unusedBit_493_18 = bits, U32, 2116, [18:18], "false", "true"
+unusedBit_493_19 = bits, U32, 2116, [19:19], "false", "true"
+unusedBit_493_20 = bits, U32, 2116, [20:20], "false", "true"
+unusedBit_493_21 = bits, U32, 2116, [21:21], "false", "true"
+unusedBit_493_22 = bits, U32, 2116, [22:22], "false", "true"
+unusedBit_493_23 = bits, U32, 2116, [23:23], "false", "true"
+unusedBit_493_24 = bits, U32, 2116, [24:24], "false", "true"
+unusedBit_493_25 = bits, U32, 2116, [25:25], "false", "true"
+unusedBit_493_26 = bits, U32, 2116, [26:26], "false", "true"
+unusedBit_493_27 = bits, U32, 2116, [27:27], "false", "true"
+unusedBit_493_28 = bits, U32, 2116, [28:28], "false", "true"
+unusedBit_493_29 = bits, U32, 2116, [29:29], "false", "true"
+unusedBit_493_30 = bits, U32, 2116, [30:30], "false", "true"
+unusedBit_493_31 = bits, U32, 2116, [31:31], "false", "true"
 can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -1328,6 +1329,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2
 	cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel."
 	cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X"
 	ignitionDwellForCrankingMs = "Dwell duration while cranking"
+	etbRevLimitStart = "Once engine speed passes this value, start reducing ETB angle."
+	etbRevLimitRange = "This far above 'Soft limiter start', fully close the throttle. At the bottom of the range, throttle control is normal. At the top of the range, the throttle is fully closed."
 	clt_bias_resistor = "Pull-up resistor value on your board"
 	iat_bias_resistor = "Pull-up resistor value on your board"
 	hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields"
@@ -4519,13 +4522,19 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "Cut spark on RPM limit",				cutSparkOnHardLimit
         field = "RPM hard limit",                       rpmHardLimit, { cutFuelOnHardLimit || cutSparkOnHardLimit }
 		field = "Boost cut pressure",					boostCutPressure
-	
+
+	dialog = etbLimits, "Electronic Throttle Limiting"
+		field = "Smoothly close the throttle to limit RPM."
+		field = "Soft limiter start",				etbRevLimitStart
+		field = "Soft limiter range",				etbRevLimitRange
+
 	dialog = fallbacks, "Fallbacks"
 		field = "Use MAP estimation table as fallback",	enableMapEstimationTableFallback
 		field = "Failed MAP sensor fallback",			failedMapFallback, { !enableMapEstimationTableFallback }
 
 	dialog = limitsAndFallback, "Limits and fallbacks"
 		panel = limits
+		panel = etbLimits
 		panel = fallbacks
 	
 ;			Engine->Base Engine Settings
diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini
index c9e103b7af..4c5559cd86 100644
--- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini
+++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.06.15.frankenso_na6.2586866762"
+ 	signature    = "rusEFI 2021.06.16.frankenso_na6.1560413676"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.06.15.frankenso_na6.2586866762" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.06.16.frankenso_na6.1560413676" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -77,7 +77,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 15 21:31:59 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 12:53:33 UTC 2021
 
 pageSize            = 20000
 page = 1
@@ -127,7 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0
 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0
 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1
 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1
-unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0
+etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0
+etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0
 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2
 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2
 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2
@@ -566,8 +567,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2"
 knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2"
 tcuEnabled = bits, U32, 976, [28:28], "false", "true"
 unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true"
-unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true"
-unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true"
+unusedBit_290_30 = bits, U32, 976, [30:30], "false", "true"
+unusedBit_290_31 = bits, U32, 976, [31:31], "false", "true"
 etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -855,30 +856,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true"
 unused1128 = bits, U32, 2116, [5:5], "false", "true"
 unused1129 = bits, U32, 2116, [6:6], "false", "true"
 unused1130 = bits, U32, 2116, [7:7], "false", "true"
-unusedBit_492_8 = bits, U32, 2116, [8:8], "false", "true"
-unusedBit_492_9 = bits, U32, 2116, [9:9], "false", "true"
-unusedBit_492_10 = bits, U32, 2116, [10:10], "false", "true"
-unusedBit_492_11 = bits, U32, 2116, [11:11], "false", "true"
-unusedBit_492_12 = bits, U32, 2116, [12:12], "false", "true"
-unusedBit_492_13 = bits, U32, 2116, [13:13], "false", "true"
-unusedBit_492_14 = bits, U32, 2116, [14:14], "false", "true"
-unusedBit_492_15 = bits, U32, 2116, [15:15], "false", "true"
-unusedBit_492_16 = bits, U32, 2116, [16:16], "false", "true"
-unusedBit_492_17 = bits, U32, 2116, [17:17], "false", "true"
-unusedBit_492_18 = bits, U32, 2116, [18:18], "false", "true"
-unusedBit_492_19 = bits, U32, 2116, [19:19], "false", "true"
-unusedBit_492_20 = bits, U32, 2116, [20:20], "false", "true"
-unusedBit_492_21 = bits, U32, 2116, [21:21], "false", "true"
-unusedBit_492_22 = bits, U32, 2116, [22:22], "false", "true"
-unusedBit_492_23 = bits, U32, 2116, [23:23], "false", "true"
-unusedBit_492_24 = bits, U32, 2116, [24:24], "false", "true"
-unusedBit_492_25 = bits, U32, 2116, [25:25], "false", "true"
-unusedBit_492_26 = bits, U32, 2116, [26:26], "false", "true"
-unusedBit_492_27 = bits, U32, 2116, [27:27], "false", "true"
-unusedBit_492_28 = bits, U32, 2116, [28:28], "false", "true"
-unusedBit_492_29 = bits, U32, 2116, [29:29], "false", "true"
-unusedBit_492_30 = bits, U32, 2116, [30:30], "false", "true"
-unusedBit_492_31 = bits, U32, 2116, [31:31], "false", "true"
+unusedBit_493_8 = bits, U32, 2116, [8:8], "false", "true"
+unusedBit_493_9 = bits, U32, 2116, [9:9], "false", "true"
+unusedBit_493_10 = bits, U32, 2116, [10:10], "false", "true"
+unusedBit_493_11 = bits, U32, 2116, [11:11], "false", "true"
+unusedBit_493_12 = bits, U32, 2116, [12:12], "false", "true"
+unusedBit_493_13 = bits, U32, 2116, [13:13], "false", "true"
+unusedBit_493_14 = bits, U32, 2116, [14:14], "false", "true"
+unusedBit_493_15 = bits, U32, 2116, [15:15], "false", "true"
+unusedBit_493_16 = bits, U32, 2116, [16:16], "false", "true"
+unusedBit_493_17 = bits, U32, 2116, [17:17], "false", "true"
+unusedBit_493_18 = bits, U32, 2116, [18:18], "false", "true"
+unusedBit_493_19 = bits, U32, 2116, [19:19], "false", "true"
+unusedBit_493_20 = bits, U32, 2116, [20:20], "false", "true"
+unusedBit_493_21 = bits, U32, 2116, [21:21], "false", "true"
+unusedBit_493_22 = bits, U32, 2116, [22:22], "false", "true"
+unusedBit_493_23 = bits, U32, 2116, [23:23], "false", "true"
+unusedBit_493_24 = bits, U32, 2116, [24:24], "false", "true"
+unusedBit_493_25 = bits, U32, 2116, [25:25], "false", "true"
+unusedBit_493_26 = bits, U32, 2116, [26:26], "false", "true"
+unusedBit_493_27 = bits, U32, 2116, [27:27], "false", "true"
+unusedBit_493_28 = bits, U32, 2116, [28:28], "false", "true"
+unusedBit_493_29 = bits, U32, 2116, [29:29], "false", "true"
+unusedBit_493_30 = bits, U32, 2116, [30:30], "false", "true"
+unusedBit_493_31 = bits, U32, 2116, [31:31], "false", "true"
 can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -1328,6 +1329,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2
 	cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel."
 	cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X"
 	ignitionDwellForCrankingMs = "Dwell duration while cranking"
+	etbRevLimitStart = "Once engine speed passes this value, start reducing ETB angle."
+	etbRevLimitRange = "This far above 'Soft limiter start', fully close the throttle. At the bottom of the range, throttle control is normal. At the top of the range, the throttle is fully closed."
 	clt_bias_resistor = "Pull-up resistor value on your board"
 	iat_bias_resistor = "Pull-up resistor value on your board"
 	hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields"
@@ -4519,13 +4522,19 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "Cut spark on RPM limit",				cutSparkOnHardLimit
         field = "RPM hard limit",                       rpmHardLimit, { cutFuelOnHardLimit || cutSparkOnHardLimit }
 		field = "Boost cut pressure",					boostCutPressure
-	
+
+	dialog = etbLimits, "Electronic Throttle Limiting"
+		field = "Smoothly close the throttle to limit RPM."
+		field = "Soft limiter start",				etbRevLimitStart
+		field = "Soft limiter range",				etbRevLimitRange
+
 	dialog = fallbacks, "Fallbacks"
 		field = "Use MAP estimation table as fallback",	enableMapEstimationTableFallback
 		field = "Failed MAP sensor fallback",			failedMapFallback, { !enableMapEstimationTableFallback }
 
 	dialog = limitsAndFallback, "Limits and fallbacks"
 		panel = limits
+		panel = etbLimits
 		panel = fallbacks
 	
 ;			Engine->Base Engine Settings
diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini
index 05c0130840..18b637f971 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.06.15.hellen121nissan.1780118080"
+ 	signature    = "rusEFI 2021.06.16.hellen121nissan.2905080806"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.06.15.hellen121nissan.1780118080" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.06.16.hellen121nissan.2905080806" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -77,7 +77,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 15 21:31:50 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 12:53:26 UTC 2021
 
 pageSize            = 20000
 page = 1
@@ -127,7 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0
 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0
 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1
 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1
-unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0
+etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0
+etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0
 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2
 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2
 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2
@@ -566,8 +567,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2"
 knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2"
 tcuEnabled = bits, U32, 976, [28:28], "false", "true"
 unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true"
-unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true"
-unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true"
+unusedBit_290_30 = bits, U32, 976, [30:30], "false", "true"
+unusedBit_290_31 = bits, U32, 976, [31:31], "false", "true"
 etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -855,30 +856,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true"
 unused1128 = bits, U32, 2116, [5:5], "false", "true"
 unused1129 = bits, U32, 2116, [6:6], "false", "true"
 unused1130 = bits, U32, 2116, [7:7], "false", "true"
-unusedBit_492_8 = bits, U32, 2116, [8:8], "false", "true"
-unusedBit_492_9 = bits, U32, 2116, [9:9], "false", "true"
-unusedBit_492_10 = bits, U32, 2116, [10:10], "false", "true"
-unusedBit_492_11 = bits, U32, 2116, [11:11], "false", "true"
-unusedBit_492_12 = bits, U32, 2116, [12:12], "false", "true"
-unusedBit_492_13 = bits, U32, 2116, [13:13], "false", "true"
-unusedBit_492_14 = bits, U32, 2116, [14:14], "false", "true"
-unusedBit_492_15 = bits, U32, 2116, [15:15], "false", "true"
-unusedBit_492_16 = bits, U32, 2116, [16:16], "false", "true"
-unusedBit_492_17 = bits, U32, 2116, [17:17], "false", "true"
-unusedBit_492_18 = bits, U32, 2116, [18:18], "false", "true"
-unusedBit_492_19 = bits, U32, 2116, [19:19], "false", "true"
-unusedBit_492_20 = bits, U32, 2116, [20:20], "false", "true"
-unusedBit_492_21 = bits, U32, 2116, [21:21], "false", "true"
-unusedBit_492_22 = bits, U32, 2116, [22:22], "false", "true"
-unusedBit_492_23 = bits, U32, 2116, [23:23], "false", "true"
-unusedBit_492_24 = bits, U32, 2116, [24:24], "false", "true"
-unusedBit_492_25 = bits, U32, 2116, [25:25], "false", "true"
-unusedBit_492_26 = bits, U32, 2116, [26:26], "false", "true"
-unusedBit_492_27 = bits, U32, 2116, [27:27], "false", "true"
-unusedBit_492_28 = bits, U32, 2116, [28:28], "false", "true"
-unusedBit_492_29 = bits, U32, 2116, [29:29], "false", "true"
-unusedBit_492_30 = bits, U32, 2116, [30:30], "false", "true"
-unusedBit_492_31 = bits, U32, 2116, [31:31], "false", "true"
+unusedBit_493_8 = bits, U32, 2116, [8:8], "false", "true"
+unusedBit_493_9 = bits, U32, 2116, [9:9], "false", "true"
+unusedBit_493_10 = bits, U32, 2116, [10:10], "false", "true"
+unusedBit_493_11 = bits, U32, 2116, [11:11], "false", "true"
+unusedBit_493_12 = bits, U32, 2116, [12:12], "false", "true"
+unusedBit_493_13 = bits, U32, 2116, [13:13], "false", "true"
+unusedBit_493_14 = bits, U32, 2116, [14:14], "false", "true"
+unusedBit_493_15 = bits, U32, 2116, [15:15], "false", "true"
+unusedBit_493_16 = bits, U32, 2116, [16:16], "false", "true"
+unusedBit_493_17 = bits, U32, 2116, [17:17], "false", "true"
+unusedBit_493_18 = bits, U32, 2116, [18:18], "false", "true"
+unusedBit_493_19 = bits, U32, 2116, [19:19], "false", "true"
+unusedBit_493_20 = bits, U32, 2116, [20:20], "false", "true"
+unusedBit_493_21 = bits, U32, 2116, [21:21], "false", "true"
+unusedBit_493_22 = bits, U32, 2116, [22:22], "false", "true"
+unusedBit_493_23 = bits, U32, 2116, [23:23], "false", "true"
+unusedBit_493_24 = bits, U32, 2116, [24:24], "false", "true"
+unusedBit_493_25 = bits, U32, 2116, [25:25], "false", "true"
+unusedBit_493_26 = bits, U32, 2116, [26:26], "false", "true"
+unusedBit_493_27 = bits, U32, 2116, [27:27], "false", "true"
+unusedBit_493_28 = bits, U32, 2116, [28:28], "false", "true"
+unusedBit_493_29 = bits, U32, 2116, [29:29], "false", "true"
+unusedBit_493_30 = bits, U32, 2116, [30:30], "false", "true"
+unusedBit_493_31 = bits, U32, 2116, [31:31], "false", "true"
 can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -1328,6 +1329,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2
 	cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel."
 	cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X"
 	ignitionDwellForCrankingMs = "Dwell duration while cranking"
+	etbRevLimitStart = "Once engine speed passes this value, start reducing ETB angle."
+	etbRevLimitRange = "This far above 'Soft limiter start', fully close the throttle. At the bottom of the range, throttle control is normal. At the top of the range, the throttle is fully closed."
 	clt_bias_resistor = "Pull-up resistor value on your board"
 	iat_bias_resistor = "Pull-up resistor value on your board"
 	hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields"
@@ -4495,13 +4498,19 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "Cut spark on RPM limit",				cutSparkOnHardLimit
         field = "RPM hard limit",                       rpmHardLimit, { cutFuelOnHardLimit || cutSparkOnHardLimit }
 		field = "Boost cut pressure",					boostCutPressure
-	
+
+	dialog = etbLimits, "Electronic Throttle Limiting"
+		field = "Smoothly close the throttle to limit RPM."
+		field = "Soft limiter start",				etbRevLimitStart
+		field = "Soft limiter range",				etbRevLimitRange
+
 	dialog = fallbacks, "Fallbacks"
 		field = "Use MAP estimation table as fallback",	enableMapEstimationTableFallback
 		field = "Failed MAP sensor fallback",			failedMapFallback, { !enableMapEstimationTableFallback }
 
 	dialog = limitsAndFallback, "Limits and fallbacks"
 		panel = limits
+		panel = etbLimits
 		panel = fallbacks
 	
 ;			Engine->Base Engine Settings
diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini
index c6183e9cec..788a5d3c8a 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.06.15.hellen121vag.3092364949"
+ 	signature    = "rusEFI 2021.06.16.hellen121vag.2137247539"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.06.15.hellen121vag.3092364949" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.06.16.hellen121vag.2137247539" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -77,7 +77,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 15 21:31:48 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 12:53:24 UTC 2021
 
 pageSize            = 20000
 page = 1
@@ -127,7 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0
 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0
 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1
 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1
-unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0
+etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0
+etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0
 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2
 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2
 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2
@@ -566,8 +567,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2"
 knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2"
 tcuEnabled = bits, U32, 976, [28:28], "false", "true"
 unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true"
-unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true"
-unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true"
+unusedBit_290_30 = bits, U32, 976, [30:30], "false", "true"
+unusedBit_290_31 = bits, U32, 976, [31:31], "false", "true"
 etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -855,30 +856,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true"
 unused1128 = bits, U32, 2116, [5:5], "false", "true"
 unused1129 = bits, U32, 2116, [6:6], "false", "true"
 unused1130 = bits, U32, 2116, [7:7], "false", "true"
-unusedBit_492_8 = bits, U32, 2116, [8:8], "false", "true"
-unusedBit_492_9 = bits, U32, 2116, [9:9], "false", "true"
-unusedBit_492_10 = bits, U32, 2116, [10:10], "false", "true"
-unusedBit_492_11 = bits, U32, 2116, [11:11], "false", "true"
-unusedBit_492_12 = bits, U32, 2116, [12:12], "false", "true"
-unusedBit_492_13 = bits, U32, 2116, [13:13], "false", "true"
-unusedBit_492_14 = bits, U32, 2116, [14:14], "false", "true"
-unusedBit_492_15 = bits, U32, 2116, [15:15], "false", "true"
-unusedBit_492_16 = bits, U32, 2116, [16:16], "false", "true"
-unusedBit_492_17 = bits, U32, 2116, [17:17], "false", "true"
-unusedBit_492_18 = bits, U32, 2116, [18:18], "false", "true"
-unusedBit_492_19 = bits, U32, 2116, [19:19], "false", "true"
-unusedBit_492_20 = bits, U32, 2116, [20:20], "false", "true"
-unusedBit_492_21 = bits, U32, 2116, [21:21], "false", "true"
-unusedBit_492_22 = bits, U32, 2116, [22:22], "false", "true"
-unusedBit_492_23 = bits, U32, 2116, [23:23], "false", "true"
-unusedBit_492_24 = bits, U32, 2116, [24:24], "false", "true"
-unusedBit_492_25 = bits, U32, 2116, [25:25], "false", "true"
-unusedBit_492_26 = bits, U32, 2116, [26:26], "false", "true"
-unusedBit_492_27 = bits, U32, 2116, [27:27], "false", "true"
-unusedBit_492_28 = bits, U32, 2116, [28:28], "false", "true"
-unusedBit_492_29 = bits, U32, 2116, [29:29], "false", "true"
-unusedBit_492_30 = bits, U32, 2116, [30:30], "false", "true"
-unusedBit_492_31 = bits, U32, 2116, [31:31], "false", "true"
+unusedBit_493_8 = bits, U32, 2116, [8:8], "false", "true"
+unusedBit_493_9 = bits, U32, 2116, [9:9], "false", "true"
+unusedBit_493_10 = bits, U32, 2116, [10:10], "false", "true"
+unusedBit_493_11 = bits, U32, 2116, [11:11], "false", "true"
+unusedBit_493_12 = bits, U32, 2116, [12:12], "false", "true"
+unusedBit_493_13 = bits, U32, 2116, [13:13], "false", "true"
+unusedBit_493_14 = bits, U32, 2116, [14:14], "false", "true"
+unusedBit_493_15 = bits, U32, 2116, [15:15], "false", "true"
+unusedBit_493_16 = bits, U32, 2116, [16:16], "false", "true"
+unusedBit_493_17 = bits, U32, 2116, [17:17], "false", "true"
+unusedBit_493_18 = bits, U32, 2116, [18:18], "false", "true"
+unusedBit_493_19 = bits, U32, 2116, [19:19], "false", "true"
+unusedBit_493_20 = bits, U32, 2116, [20:20], "false", "true"
+unusedBit_493_21 = bits, U32, 2116, [21:21], "false", "true"
+unusedBit_493_22 = bits, U32, 2116, [22:22], "false", "true"
+unusedBit_493_23 = bits, U32, 2116, [23:23], "false", "true"
+unusedBit_493_24 = bits, U32, 2116, [24:24], "false", "true"
+unusedBit_493_25 = bits, U32, 2116, [25:25], "false", "true"
+unusedBit_493_26 = bits, U32, 2116, [26:26], "false", "true"
+unusedBit_493_27 = bits, U32, 2116, [27:27], "false", "true"
+unusedBit_493_28 = bits, U32, 2116, [28:28], "false", "true"
+unusedBit_493_29 = bits, U32, 2116, [29:29], "false", "true"
+unusedBit_493_30 = bits, U32, 2116, [30:30], "false", "true"
+unusedBit_493_31 = bits, U32, 2116, [31:31], "false", "true"
 can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -1328,6 +1329,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2
 	cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel."
 	cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X"
 	ignitionDwellForCrankingMs = "Dwell duration while cranking"
+	etbRevLimitStart = "Once engine speed passes this value, start reducing ETB angle."
+	etbRevLimitRange = "This far above 'Soft limiter start', fully close the throttle. At the bottom of the range, throttle control is normal. At the top of the range, the throttle is fully closed."
 	clt_bias_resistor = "Pull-up resistor value on your board"
 	iat_bias_resistor = "Pull-up resistor value on your board"
 	hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields"
@@ -4495,13 +4498,19 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "Cut spark on RPM limit",				cutSparkOnHardLimit
         field = "RPM hard limit",                       rpmHardLimit, { cutFuelOnHardLimit || cutSparkOnHardLimit }
 		field = "Boost cut pressure",					boostCutPressure
-	
+
+	dialog = etbLimits, "Electronic Throttle Limiting"
+		field = "Smoothly close the throttle to limit RPM."
+		field = "Soft limiter start",				etbRevLimitStart
+		field = "Soft limiter range",				etbRevLimitRange
+
 	dialog = fallbacks, "Fallbacks"
 		field = "Use MAP estimation table as fallback",	enableMapEstimationTableFallback
 		field = "Failed MAP sensor fallback",			failedMapFallback, { !enableMapEstimationTableFallback }
 
 	dialog = limitsAndFallback, "Limits and fallbacks"
 		panel = limits
+		panel = etbLimits
 		panel = fallbacks
 	
 ;			Engine->Base Engine Settings
diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini
index 68de033f79..ccbced18b9 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen128.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen128.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.06.15.hellen128.1434513047"
+ 	signature    = "rusEFI 2021.06.16.hellen128.2461179697"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.06.15.hellen128.1434513047" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.06.16.hellen128.2461179697" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -77,7 +77,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 15 21:31:44 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 12:53:21 UTC 2021
 
 pageSize            = 20000
 page = 1
@@ -127,7 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0
 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0
 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1
 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1
-unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0
+etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0
+etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0
 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2
 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2
 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2
@@ -566,8 +567,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2"
 knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2"
 tcuEnabled = bits, U32, 976, [28:28], "false", "true"
 unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true"
-unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true"
-unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true"
+unusedBit_290_30 = bits, U32, 976, [30:30], "false", "true"
+unusedBit_290_31 = bits, U32, 976, [31:31], "false", "true"
 etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -855,30 +856,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true"
 unused1128 = bits, U32, 2116, [5:5], "false", "true"
 unused1129 = bits, U32, 2116, [6:6], "false", "true"
 unused1130 = bits, U32, 2116, [7:7], "false", "true"
-unusedBit_492_8 = bits, U32, 2116, [8:8], "false", "true"
-unusedBit_492_9 = bits, U32, 2116, [9:9], "false", "true"
-unusedBit_492_10 = bits, U32, 2116, [10:10], "false", "true"
-unusedBit_492_11 = bits, U32, 2116, [11:11], "false", "true"
-unusedBit_492_12 = bits, U32, 2116, [12:12], "false", "true"
-unusedBit_492_13 = bits, U32, 2116, [13:13], "false", "true"
-unusedBit_492_14 = bits, U32, 2116, [14:14], "false", "true"
-unusedBit_492_15 = bits, U32, 2116, [15:15], "false", "true"
-unusedBit_492_16 = bits, U32, 2116, [16:16], "false", "true"
-unusedBit_492_17 = bits, U32, 2116, [17:17], "false", "true"
-unusedBit_492_18 = bits, U32, 2116, [18:18], "false", "true"
-unusedBit_492_19 = bits, U32, 2116, [19:19], "false", "true"
-unusedBit_492_20 = bits, U32, 2116, [20:20], "false", "true"
-unusedBit_492_21 = bits, U32, 2116, [21:21], "false", "true"
-unusedBit_492_22 = bits, U32, 2116, [22:22], "false", "true"
-unusedBit_492_23 = bits, U32, 2116, [23:23], "false", "true"
-unusedBit_492_24 = bits, U32, 2116, [24:24], "false", "true"
-unusedBit_492_25 = bits, U32, 2116, [25:25], "false", "true"
-unusedBit_492_26 = bits, U32, 2116, [26:26], "false", "true"
-unusedBit_492_27 = bits, U32, 2116, [27:27], "false", "true"
-unusedBit_492_28 = bits, U32, 2116, [28:28], "false", "true"
-unusedBit_492_29 = bits, U32, 2116, [29:29], "false", "true"
-unusedBit_492_30 = bits, U32, 2116, [30:30], "false", "true"
-unusedBit_492_31 = bits, U32, 2116, [31:31], "false", "true"
+unusedBit_493_8 = bits, U32, 2116, [8:8], "false", "true"
+unusedBit_493_9 = bits, U32, 2116, [9:9], "false", "true"
+unusedBit_493_10 = bits, U32, 2116, [10:10], "false", "true"
+unusedBit_493_11 = bits, U32, 2116, [11:11], "false", "true"
+unusedBit_493_12 = bits, U32, 2116, [12:12], "false", "true"
+unusedBit_493_13 = bits, U32, 2116, [13:13], "false", "true"
+unusedBit_493_14 = bits, U32, 2116, [14:14], "false", "true"
+unusedBit_493_15 = bits, U32, 2116, [15:15], "false", "true"
+unusedBit_493_16 = bits, U32, 2116, [16:16], "false", "true"
+unusedBit_493_17 = bits, U32, 2116, [17:17], "false", "true"
+unusedBit_493_18 = bits, U32, 2116, [18:18], "false", "true"
+unusedBit_493_19 = bits, U32, 2116, [19:19], "false", "true"
+unusedBit_493_20 = bits, U32, 2116, [20:20], "false", "true"
+unusedBit_493_21 = bits, U32, 2116, [21:21], "false", "true"
+unusedBit_493_22 = bits, U32, 2116, [22:22], "false", "true"
+unusedBit_493_23 = bits, U32, 2116, [23:23], "false", "true"
+unusedBit_493_24 = bits, U32, 2116, [24:24], "false", "true"
+unusedBit_493_25 = bits, U32, 2116, [25:25], "false", "true"
+unusedBit_493_26 = bits, U32, 2116, [26:26], "false", "true"
+unusedBit_493_27 = bits, U32, 2116, [27:27], "false", "true"
+unusedBit_493_28 = bits, U32, 2116, [28:28], "false", "true"
+unusedBit_493_29 = bits, U32, 2116, [29:29], "false", "true"
+unusedBit_493_30 = bits, U32, 2116, [30:30], "false", "true"
+unusedBit_493_31 = bits, U32, 2116, [31:31], "false", "true"
 can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -1328,6 +1329,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2
 	cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel."
 	cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X"
 	ignitionDwellForCrankingMs = "Dwell duration while cranking"
+	etbRevLimitStart = "Once engine speed passes this value, start reducing ETB angle."
+	etbRevLimitRange = "This far above 'Soft limiter start', fully close the throttle. At the bottom of the range, throttle control is normal. At the top of the range, the throttle is fully closed."
 	clt_bias_resistor = "Pull-up resistor value on your board"
 	iat_bias_resistor = "Pull-up resistor value on your board"
 	hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields"
@@ -4495,13 +4498,19 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "Cut spark on RPM limit",				cutSparkOnHardLimit
         field = "RPM hard limit",                       rpmHardLimit, { cutFuelOnHardLimit || cutSparkOnHardLimit }
 		field = "Boost cut pressure",					boostCutPressure
-	
+
+	dialog = etbLimits, "Electronic Throttle Limiting"
+		field = "Smoothly close the throttle to limit RPM."
+		field = "Soft limiter start",				etbRevLimitStart
+		field = "Soft limiter range",				etbRevLimitRange
+
 	dialog = fallbacks, "Fallbacks"
 		field = "Use MAP estimation table as fallback",	enableMapEstimationTableFallback
 		field = "Failed MAP sensor fallback",			failedMapFallback, { !enableMapEstimationTableFallback }
 
 	dialog = limitsAndFallback, "Limits and fallbacks"
 		panel = limits
+		panel = etbLimits
 		panel = fallbacks
 	
 ;			Engine->Base Engine Settings
diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini
index b616de86b6..77f61864de 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen72.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.06.15.hellen72.210241016"
+ 	signature    = "rusEFI 2021.06.16.hellen72.3417994334"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.06.15.hellen72.210241016" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.06.16.hellen72.3417994334" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -77,7 +77,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 15 21:31:51 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 12:53:27 UTC 2021
 
 pageSize            = 20000
 page = 1
@@ -127,7 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0
 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0
 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1
 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1
-unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0
+etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0
+etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0
 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2
 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2
 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2
@@ -566,8 +567,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2"
 knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2"
 tcuEnabled = bits, U32, 976, [28:28], "false", "true"
 unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true"
-unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true"
-unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true"
+unusedBit_290_30 = bits, U32, 976, [30:30], "false", "true"
+unusedBit_290_31 = bits, U32, 976, [31:31], "false", "true"
 etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -855,30 +856,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true"
 unused1128 = bits, U32, 2116, [5:5], "false", "true"
 unused1129 = bits, U32, 2116, [6:6], "false", "true"
 unused1130 = bits, U32, 2116, [7:7], "false", "true"
-unusedBit_492_8 = bits, U32, 2116, [8:8], "false", "true"
-unusedBit_492_9 = bits, U32, 2116, [9:9], "false", "true"
-unusedBit_492_10 = bits, U32, 2116, [10:10], "false", "true"
-unusedBit_492_11 = bits, U32, 2116, [11:11], "false", "true"
-unusedBit_492_12 = bits, U32, 2116, [12:12], "false", "true"
-unusedBit_492_13 = bits, U32, 2116, [13:13], "false", "true"
-unusedBit_492_14 = bits, U32, 2116, [14:14], "false", "true"
-unusedBit_492_15 = bits, U32, 2116, [15:15], "false", "true"
-unusedBit_492_16 = bits, U32, 2116, [16:16], "false", "true"
-unusedBit_492_17 = bits, U32, 2116, [17:17], "false", "true"
-unusedBit_492_18 = bits, U32, 2116, [18:18], "false", "true"
-unusedBit_492_19 = bits, U32, 2116, [19:19], "false", "true"
-unusedBit_492_20 = bits, U32, 2116, [20:20], "false", "true"
-unusedBit_492_21 = bits, U32, 2116, [21:21], "false", "true"
-unusedBit_492_22 = bits, U32, 2116, [22:22], "false", "true"
-unusedBit_492_23 = bits, U32, 2116, [23:23], "false", "true"
-unusedBit_492_24 = bits, U32, 2116, [24:24], "false", "true"
-unusedBit_492_25 = bits, U32, 2116, [25:25], "false", "true"
-unusedBit_492_26 = bits, U32, 2116, [26:26], "false", "true"
-unusedBit_492_27 = bits, U32, 2116, [27:27], "false", "true"
-unusedBit_492_28 = bits, U32, 2116, [28:28], "false", "true"
-unusedBit_492_29 = bits, U32, 2116, [29:29], "false", "true"
-unusedBit_492_30 = bits, U32, 2116, [30:30], "false", "true"
-unusedBit_492_31 = bits, U32, 2116, [31:31], "false", "true"
+unusedBit_493_8 = bits, U32, 2116, [8:8], "false", "true"
+unusedBit_493_9 = bits, U32, 2116, [9:9], "false", "true"
+unusedBit_493_10 = bits, U32, 2116, [10:10], "false", "true"
+unusedBit_493_11 = bits, U32, 2116, [11:11], "false", "true"
+unusedBit_493_12 = bits, U32, 2116, [12:12], "false", "true"
+unusedBit_493_13 = bits, U32, 2116, [13:13], "false", "true"
+unusedBit_493_14 = bits, U32, 2116, [14:14], "false", "true"
+unusedBit_493_15 = bits, U32, 2116, [15:15], "false", "true"
+unusedBit_493_16 = bits, U32, 2116, [16:16], "false", "true"
+unusedBit_493_17 = bits, U32, 2116, [17:17], "false", "true"
+unusedBit_493_18 = bits, U32, 2116, [18:18], "false", "true"
+unusedBit_493_19 = bits, U32, 2116, [19:19], "false", "true"
+unusedBit_493_20 = bits, U32, 2116, [20:20], "false", "true"
+unusedBit_493_21 = bits, U32, 2116, [21:21], "false", "true"
+unusedBit_493_22 = bits, U32, 2116, [22:22], "false", "true"
+unusedBit_493_23 = bits, U32, 2116, [23:23], "false", "true"
+unusedBit_493_24 = bits, U32, 2116, [24:24], "false", "true"
+unusedBit_493_25 = bits, U32, 2116, [25:25], "false", "true"
+unusedBit_493_26 = bits, U32, 2116, [26:26], "false", "true"
+unusedBit_493_27 = bits, U32, 2116, [27:27], "false", "true"
+unusedBit_493_28 = bits, U32, 2116, [28:28], "false", "true"
+unusedBit_493_29 = bits, U32, 2116, [29:29], "false", "true"
+unusedBit_493_30 = bits, U32, 2116, [30:30], "false", "true"
+unusedBit_493_31 = bits, U32, 2116, [31:31], "false", "true"
 can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -1328,6 +1329,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2
 	cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel."
 	cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X"
 	ignitionDwellForCrankingMs = "Dwell duration while cranking"
+	etbRevLimitStart = "Once engine speed passes this value, start reducing ETB angle."
+	etbRevLimitRange = "This far above 'Soft limiter start', fully close the throttle. At the bottom of the range, throttle control is normal. At the top of the range, the throttle is fully closed."
 	clt_bias_resistor = "Pull-up resistor value on your board"
 	iat_bias_resistor = "Pull-up resistor value on your board"
 	hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields"
@@ -4495,13 +4498,19 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "Cut spark on RPM limit",				cutSparkOnHardLimit
         field = "RPM hard limit",                       rpmHardLimit, { cutFuelOnHardLimit || cutSparkOnHardLimit }
 		field = "Boost cut pressure",					boostCutPressure
-	
+
+	dialog = etbLimits, "Electronic Throttle Limiting"
+		field = "Smoothly close the throttle to limit RPM."
+		field = "Soft limiter start",				etbRevLimitStart
+		field = "Soft limiter range",				etbRevLimitRange
+
 	dialog = fallbacks, "Fallbacks"
 		field = "Use MAP estimation table as fallback",	enableMapEstimationTableFallback
 		field = "Failed MAP sensor fallback",			failedMapFallback, { !enableMapEstimationTableFallback }
 
 	dialog = limitsAndFallback, "Limits and fallbacks"
 		panel = limits
+		panel = etbLimits
 		panel = fallbacks
 	
 ;			Engine->Base Engine Settings
diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini
index e941921f73..5ab1fabf22 100644
--- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.06.15.hellenNA6.617836873"
+ 	signature    = "rusEFI 2021.06.16.hellenNA6.3823173871"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.06.15.hellenNA6.617836873" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.06.16.hellenNA6.3823173871" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -77,7 +77,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 15 21:31:53 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 12:53:29 UTC 2021
 
 pageSize            = 20000
 page = 1
@@ -127,7 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0
 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0
 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1
 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1
-unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0
+etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0
+etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0
 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2
 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2
 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2
@@ -566,8 +567,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2"
 knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2"
 tcuEnabled = bits, U32, 976, [28:28], "false", "true"
 unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true"
-unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true"
-unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true"
+unusedBit_290_30 = bits, U32, 976, [30:30], "false", "true"
+unusedBit_290_31 = bits, U32, 976, [31:31], "false", "true"
 etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -855,30 +856,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true"
 unused1128 = bits, U32, 2116, [5:5], "false", "true"
 unused1129 = bits, U32, 2116, [6:6], "false", "true"
 unused1130 = bits, U32, 2116, [7:7], "false", "true"
-unusedBit_492_8 = bits, U32, 2116, [8:8], "false", "true"
-unusedBit_492_9 = bits, U32, 2116, [9:9], "false", "true"
-unusedBit_492_10 = bits, U32, 2116, [10:10], "false", "true"
-unusedBit_492_11 = bits, U32, 2116, [11:11], "false", "true"
-unusedBit_492_12 = bits, U32, 2116, [12:12], "false", "true"
-unusedBit_492_13 = bits, U32, 2116, [13:13], "false", "true"
-unusedBit_492_14 = bits, U32, 2116, [14:14], "false", "true"
-unusedBit_492_15 = bits, U32, 2116, [15:15], "false", "true"
-unusedBit_492_16 = bits, U32, 2116, [16:16], "false", "true"
-unusedBit_492_17 = bits, U32, 2116, [17:17], "false", "true"
-unusedBit_492_18 = bits, U32, 2116, [18:18], "false", "true"
-unusedBit_492_19 = bits, U32, 2116, [19:19], "false", "true"
-unusedBit_492_20 = bits, U32, 2116, [20:20], "false", "true"
-unusedBit_492_21 = bits, U32, 2116, [21:21], "false", "true"
-unusedBit_492_22 = bits, U32, 2116, [22:22], "false", "true"
-unusedBit_492_23 = bits, U32, 2116, [23:23], "false", "true"
-unusedBit_492_24 = bits, U32, 2116, [24:24], "false", "true"
-unusedBit_492_25 = bits, U32, 2116, [25:25], "false", "true"
-unusedBit_492_26 = bits, U32, 2116, [26:26], "false", "true"
-unusedBit_492_27 = bits, U32, 2116, [27:27], "false", "true"
-unusedBit_492_28 = bits, U32, 2116, [28:28], "false", "true"
-unusedBit_492_29 = bits, U32, 2116, [29:29], "false", "true"
-unusedBit_492_30 = bits, U32, 2116, [30:30], "false", "true"
-unusedBit_492_31 = bits, U32, 2116, [31:31], "false", "true"
+unusedBit_493_8 = bits, U32, 2116, [8:8], "false", "true"
+unusedBit_493_9 = bits, U32, 2116, [9:9], "false", "true"
+unusedBit_493_10 = bits, U32, 2116, [10:10], "false", "true"
+unusedBit_493_11 = bits, U32, 2116, [11:11], "false", "true"
+unusedBit_493_12 = bits, U32, 2116, [12:12], "false", "true"
+unusedBit_493_13 = bits, U32, 2116, [13:13], "false", "true"
+unusedBit_493_14 = bits, U32, 2116, [14:14], "false", "true"
+unusedBit_493_15 = bits, U32, 2116, [15:15], "false", "true"
+unusedBit_493_16 = bits, U32, 2116, [16:16], "false", "true"
+unusedBit_493_17 = bits, U32, 2116, [17:17], "false", "true"
+unusedBit_493_18 = bits, U32, 2116, [18:18], "false", "true"
+unusedBit_493_19 = bits, U32, 2116, [19:19], "false", "true"
+unusedBit_493_20 = bits, U32, 2116, [20:20], "false", "true"
+unusedBit_493_21 = bits, U32, 2116, [21:21], "false", "true"
+unusedBit_493_22 = bits, U32, 2116, [22:22], "false", "true"
+unusedBit_493_23 = bits, U32, 2116, [23:23], "false", "true"
+unusedBit_493_24 = bits, U32, 2116, [24:24], "false", "true"
+unusedBit_493_25 = bits, U32, 2116, [25:25], "false", "true"
+unusedBit_493_26 = bits, U32, 2116, [26:26], "false", "true"
+unusedBit_493_27 = bits, U32, 2116, [27:27], "false", "true"
+unusedBit_493_28 = bits, U32, 2116, [28:28], "false", "true"
+unusedBit_493_29 = bits, U32, 2116, [29:29], "false", "true"
+unusedBit_493_30 = bits, U32, 2116, [30:30], "false", "true"
+unusedBit_493_31 = bits, U32, 2116, [31:31], "false", "true"
 can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -1328,6 +1329,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2
 	cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel."
 	cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X"
 	ignitionDwellForCrankingMs = "Dwell duration while cranking"
+	etbRevLimitStart = "Once engine speed passes this value, start reducing ETB angle."
+	etbRevLimitRange = "This far above 'Soft limiter start', fully close the throttle. At the bottom of the range, throttle control is normal. At the top of the range, the throttle is fully closed."
 	clt_bias_resistor = "Pull-up resistor value on your board"
 	iat_bias_resistor = "Pull-up resistor value on your board"
 	hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields"
@@ -4495,13 +4498,19 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "Cut spark on RPM limit",				cutSparkOnHardLimit
         field = "RPM hard limit",                       rpmHardLimit, { cutFuelOnHardLimit || cutSparkOnHardLimit }
 		field = "Boost cut pressure",					boostCutPressure
-	
+
+	dialog = etbLimits, "Electronic Throttle Limiting"
+		field = "Smoothly close the throttle to limit RPM."
+		field = "Soft limiter start",				etbRevLimitStart
+		field = "Soft limiter range",				etbRevLimitRange
+
 	dialog = fallbacks, "Fallbacks"
 		field = "Use MAP estimation table as fallback",	enableMapEstimationTableFallback
 		field = "Failed MAP sensor fallback",			failedMapFallback, { !enableMapEstimationTableFallback }
 
 	dialog = limitsAndFallback, "Limits and fallbacks"
 		panel = limits
+		panel = etbLimits
 		panel = fallbacks
 	
 ;			Engine->Base Engine Settings
diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini
index c5b34f21c0..12a4eb5895 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.06.15.hellen_cypress.3758236067"
+ 	signature    = "rusEFI 2021.06.16.hellen_cypress.657477637"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.06.15.hellen_cypress.3758236067" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.06.16.hellen_cypress.657477637" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -77,7 +77,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Jun 15 21:32:10 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jun 16 12:53:42 UTC 2021
 
 pageSize            = 20000
 page = 1
@@ -127,7 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0
 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0
 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1
 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1
-unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0
+etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0
+etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0
 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2
 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2
 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2
@@ -566,8 +567,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2"
 knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2"
 tcuEnabled = bits, U32, 976, [28:28], "false", "true"
 unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true"
-unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true"
-unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true"
+unusedBit_290_30 = bits, U32, 976, [30:30], "false", "true"
+unusedBit_290_31 = bits, U32, 976, [31:31], "false", "true"
 etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -855,30 +856,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true"
 unused1128 = bits, U32, 2116, [5:5], "false", "true"
 unused1129 = bits, U32, 2116, [6:6], "false", "true"
 unused1130 = bits, U32, 2116, [7:7], "false", "true"
-unusedBit_492_8 = bits, U32, 2116, [8:8], "false", "true"
-unusedBit_492_9 = bits, U32, 2116, [9:9], "false", "true"
-unusedBit_492_10 = bits, U32, 2116, [10:10], "false", "true"
-unusedBit_492_11 = bits, U32, 2116, [11:11], "false", "true"
-unusedBit_492_12 = bits, U32, 2116, [12:12], "false", "true"
-unusedBit_492_13 = bits, U32, 2116, [13:13], "false", "true"
-unusedBit_492_14 = bits, U32, 2116, [14:14], "false", "true"
-unusedBit_492_15 = bits, U32, 2116, [15:15], "false", "true"
-unusedBit_492_16 = bits, U32, 2116, [16:16], "false", "true"
-unusedBit_492_17 = bits, U32, 2116, [17:17], "false", "true"
-unusedBit_492_18 = bits, U32, 2116, [18:18], "false", "true"
-unusedBit_492_19 = bits, U32, 2116, [19:19], "false", "true"
-unusedBit_492_20 = bits, U32, 2116, [20:20], "false", "true"
-unusedBit_492_21 = bits, U32, 2116, [21:21], "false", "true"
-unusedBit_492_22 = bits, U32, 2116, [22:22], "false", "true"
-unusedBit_492_23 = bits, U32, 2116, [23:23], "false", "true"
-unusedBit_492_24 = bits, U32, 2116, [24:24], "false", "true"
-unusedBit_492_25 = bits, U32, 2116, [25:25], "false", "true"
-unusedBit_492_26 = bits, U32, 2116, [26:26], "false", "true"
-unusedBit_492_27 = bits, U32, 2116, [27:27], "false", "true"
-unusedBit_492_28 = bits, U32, 2116, [28:28], "false", "true"
-unusedBit_492_29 = bits, U32, 2116, [29:29], "false", "true"
-unusedBit_492_30 = bits, U32, 2116, [30:30], "false", "true"
-unusedBit_492_31 = bits, U32, 2116, [31:31], "false", "true"
+unusedBit_493_8 = bits, U32, 2116, [8:8], "false", "true"
+unusedBit_493_9 = bits, U32, 2116, [9:9], "false", "true"
+unusedBit_493_10 = bits, U32, 2116, [10:10], "false", "true"
+unusedBit_493_11 = bits, U32, 2116, [11:11], "false", "true"
+unusedBit_493_12 = bits, U32, 2116, [12:12], "false", "true"
+unusedBit_493_13 = bits, U32, 2116, [13:13], "false", "true"
+unusedBit_493_14 = bits, U32, 2116, [14:14], "false", "true"
+unusedBit_493_15 = bits, U32, 2116, [15:15], "false", "true"
+unusedBit_493_16 = bits, U32, 2116, [16:16], "false", "true"
+unusedBit_493_17 = bits, U32, 2116, [17:17], "false", "true"
+unusedBit_493_18 = bits, U32, 2116, [18:18], "false", "true"
+unusedBit_493_19 = bits, U32, 2116, [19:19], "false", "true"
+unusedBit_493_20 = bits, U32, 2116, [20:20], "false", "true"
+unusedBit_493_21 = bits, U32, 2116, [21:21], "false", "true"
+unusedBit_493_22 = bits, U32, 2116, [22:22], "false", "true"
+unusedBit_493_23 = bits, U32, 2116, [23:23], "false", "true"
+unusedBit_493_24 = bits, U32, 2116, [24:24], "false", "true"
+unusedBit_493_25 = bits, U32, 2116, [25:25], "false", "true"
+unusedBit_493_26 = bits, U32, 2116, [26:26], "false", "true"
+unusedBit_493_27 = bits, U32, 2116, [27:27], "false", "true"
+unusedBit_493_28 = bits, U32, 2116, [28:28], "false", "true"
+unusedBit_493_29 = bits, U32, 2116, [29:29], "false", "true"
+unusedBit_493_30 = bits, U32, 2116, [30:30], "false", "true"
+unusedBit_493_31 = bits, U32, 2116, [31:31], "false", "true"
 can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -1328,6 +1329,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2
 	cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel."
 	cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X"
 	ignitionDwellForCrankingMs = "Dwell duration while cranking"
+	etbRevLimitStart = "Once engine speed passes this value, start reducing ETB angle."
+	etbRevLimitRange = "This far above 'Soft limiter start', fully close the throttle. At the bottom of the range, throttle control is normal. At the top of the range, the throttle is fully closed."
 	clt_bias_resistor = "Pull-up resistor value on your board"
 	iat_bias_resistor = "Pull-up resistor value on your board"
 	hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields"
@@ -4519,13 +4522,19 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "Cut spark on RPM limit",				cutSparkOnHardLimit
         field = "RPM hard limit",                       rpmHardLimit, { cutFuelOnHardLimit || cutSparkOnHardLimit }
 		field = "Boost cut pressure",					boostCutPressure
-	
+
+	dialog = etbLimits, "Electronic Throttle Limiting"
+		field = "Smoothly close the throttle to limit RPM."
+		field = "Soft limiter start",				etbRevLimitStart
+		field = "Soft limiter range",				etbRevLimitRange
+
 	dialog = fallbacks, "Fallbacks"
 		field = "Use MAP estimation table as fallback",	enableMapEstimationTableFallback
 		field = "Failed MAP sensor fallback",			failedMapFallback, { !enableMapEstimationTableFallback }
 
 	dialog = limitsAndFallback, "Limits and fallbacks"
 		panel = limits
+		panel = etbLimits
 		panel = fallbacks
 	
 ;			Engine->Base Engine Settings
diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini
index 3cc9c0571a..f42c9c883c 100644
--- a/firmware/tunerstudio/generated/rusefi_kinetis.ini
+++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.06.15.kin.531098975"
+ 	signature    = "rusEFI 2021.06.16.kin.3633683705"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.06.15.kin.531098975" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.06.16.kin.3633683705" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -77,7 +77,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Jun 15 21:32:08 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jun 16 12:53:41 UTC 2021
 
 pageSize            = 19972
 page = 1
@@ -127,7 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0
 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0
 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1
 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1
-unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0
+etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0
+etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0
 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2
 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2
 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2
@@ -563,8 +564,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2"
 knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2"
 tcuEnabled = bits, U32, 976, [28:28], "false", "true"
 unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true"
-unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true"
-unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true"
+unusedBit_290_30 = bits, U32, 976, [30:30], "false", "true"
+unusedBit_290_31 = bits, U32, 976, [31:31], "false", "true"
 etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -852,30 +853,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true"
 unused1128 = bits, U32, 2116, [5:5], "false", "true"
 unused1129 = bits, U32, 2116, [6:6], "false", "true"
 unused1130 = bits, U32, 2116, [7:7], "false", "true"
-unusedBit_492_8 = bits, U32, 2116, [8:8], "false", "true"
-unusedBit_492_9 = bits, U32, 2116, [9:9], "false", "true"
-unusedBit_492_10 = bits, U32, 2116, [10:10], "false", "true"
-unusedBit_492_11 = bits, U32, 2116, [11:11], "false", "true"
-unusedBit_492_12 = bits, U32, 2116, [12:12], "false", "true"
-unusedBit_492_13 = bits, U32, 2116, [13:13], "false", "true"
-unusedBit_492_14 = bits, U32, 2116, [14:14], "false", "true"
-unusedBit_492_15 = bits, U32, 2116, [15:15], "false", "true"
-unusedBit_492_16 = bits, U32, 2116, [16:16], "false", "true"
-unusedBit_492_17 = bits, U32, 2116, [17:17], "false", "true"
-unusedBit_492_18 = bits, U32, 2116, [18:18], "false", "true"
-unusedBit_492_19 = bits, U32, 2116, [19:19], "false", "true"
-unusedBit_492_20 = bits, U32, 2116, [20:20], "false", "true"
-unusedBit_492_21 = bits, U32, 2116, [21:21], "false", "true"
-unusedBit_492_22 = bits, U32, 2116, [22:22], "false", "true"
-unusedBit_492_23 = bits, U32, 2116, [23:23], "false", "true"
-unusedBit_492_24 = bits, U32, 2116, [24:24], "false", "true"
-unusedBit_492_25 = bits, U32, 2116, [25:25], "false", "true"
-unusedBit_492_26 = bits, U32, 2116, [26:26], "false", "true"
-unusedBit_492_27 = bits, U32, 2116, [27:27], "false", "true"
-unusedBit_492_28 = bits, U32, 2116, [28:28], "false", "true"
-unusedBit_492_29 = bits, U32, 2116, [29:29], "false", "true"
-unusedBit_492_30 = bits, U32, 2116, [30:30], "false", "true"
-unusedBit_492_31 = bits, U32, 2116, [31:31], "false", "true"
+unusedBit_493_8 = bits, U32, 2116, [8:8], "false", "true"
+unusedBit_493_9 = bits, U32, 2116, [9:9], "false", "true"
+unusedBit_493_10 = bits, U32, 2116, [10:10], "false", "true"
+unusedBit_493_11 = bits, U32, 2116, [11:11], "false", "true"
+unusedBit_493_12 = bits, U32, 2116, [12:12], "false", "true"
+unusedBit_493_13 = bits, U32, 2116, [13:13], "false", "true"
+unusedBit_493_14 = bits, U32, 2116, [14:14], "false", "true"
+unusedBit_493_15 = bits, U32, 2116, [15:15], "false", "true"
+unusedBit_493_16 = bits, U32, 2116, [16:16], "false", "true"
+unusedBit_493_17 = bits, U32, 2116, [17:17], "false", "true"
+unusedBit_493_18 = bits, U32, 2116, [18:18], "false", "true"
+unusedBit_493_19 = bits, U32, 2116, [19:19], "false", "true"
+unusedBit_493_20 = bits, U32, 2116, [20:20], "false", "true"
+unusedBit_493_21 = bits, U32, 2116, [21:21], "false", "true"
+unusedBit_493_22 = bits, U32, 2116, [22:22], "false", "true"
+unusedBit_493_23 = bits, U32, 2116, [23:23], "false", "true"
+unusedBit_493_24 = bits, U32, 2116, [24:24], "false", "true"
+unusedBit_493_25 = bits, U32, 2116, [25:25], "false", "true"
+unusedBit_493_26 = bits, U32, 2116, [26:26], "false", "true"
+unusedBit_493_27 = bits, U32, 2116, [27:27], "false", "true"
+unusedBit_493_28 = bits, U32, 2116, [28:28], "false", "true"
+unusedBit_493_29 = bits, U32, 2116, [29:29], "false", "true"
+unusedBit_493_30 = bits, U32, 2116, [30:30], "false", "true"
+unusedBit_493_31 = bits, U32, 2116, [31:31], "false", "true"
 can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -1312,6 +1313,8 @@ fsioTable4RpmBins = array, F32, 19940, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2
 	cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel."
 	cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X"
 	ignitionDwellForCrankingMs = "Dwell duration while cranking"
+	etbRevLimitStart = "Once engine speed passes this value, start reducing ETB angle."
+	etbRevLimitRange = "This far above 'Soft limiter start', fully close the throttle. At the bottom of the range, throttle control is normal. At the top of the range, the throttle is fully closed."
 	clt_bias_resistor = "Pull-up resistor value on your board"
 	iat_bias_resistor = "Pull-up resistor value on your board"
 	hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields"
@@ -4501,13 +4504,19 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "Cut spark on RPM limit",				cutSparkOnHardLimit
         field = "RPM hard limit",                       rpmHardLimit, { cutFuelOnHardLimit || cutSparkOnHardLimit }
 		field = "Boost cut pressure",					boostCutPressure
-	
+
+	dialog = etbLimits, "Electronic Throttle Limiting"
+		field = "Smoothly close the throttle to limit RPM."
+		field = "Soft limiter start",				etbRevLimitStart
+		field = "Soft limiter range",				etbRevLimitRange
+
 	dialog = fallbacks, "Fallbacks"
 		field = "Use MAP estimation table as fallback",	enableMapEstimationTableFallback
 		field = "Failed MAP sensor fallback",			failedMapFallback, { !enableMapEstimationTableFallback }
 
 	dialog = limitsAndFallback, "Limits and fallbacks"
 		panel = limits
+		panel = etbLimits
 		panel = fallbacks
 	
 ;			Engine->Base Engine Settings
diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini
index 515a5c8da3..c5c63b3e27 100644
--- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini
+++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.06.15.mre_f4.548168553"
+ 	signature    = "rusEFI 2021.06.16.mre_f4.3885896399"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.06.15.mre_f4.548168553" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.06.16.mre_f4.3885896399" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -77,7 +77,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 15 21:31:57 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 12:53:32 UTC 2021
 
 pageSize            = 20000
 page = 1
@@ -127,7 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0
 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0
 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1
 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1
-unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0
+etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0
+etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0
 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2
 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2
 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2
@@ -566,8 +567,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2"
 knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2"
 tcuEnabled = bits, U32, 976, [28:28], "false", "true"
 unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true"
-unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true"
-unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true"
+unusedBit_290_30 = bits, U32, 976, [30:30], "false", "true"
+unusedBit_290_31 = bits, U32, 976, [31:31], "false", "true"
 etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -855,30 +856,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true"
 unused1128 = bits, U32, 2116, [5:5], "false", "true"
 unused1129 = bits, U32, 2116, [6:6], "false", "true"
 unused1130 = bits, U32, 2116, [7:7], "false", "true"
-unusedBit_492_8 = bits, U32, 2116, [8:8], "false", "true"
-unusedBit_492_9 = bits, U32, 2116, [9:9], "false", "true"
-unusedBit_492_10 = bits, U32, 2116, [10:10], "false", "true"
-unusedBit_492_11 = bits, U32, 2116, [11:11], "false", "true"
-unusedBit_492_12 = bits, U32, 2116, [12:12], "false", "true"
-unusedBit_492_13 = bits, U32, 2116, [13:13], "false", "true"
-unusedBit_492_14 = bits, U32, 2116, [14:14], "false", "true"
-unusedBit_492_15 = bits, U32, 2116, [15:15], "false", "true"
-unusedBit_492_16 = bits, U32, 2116, [16:16], "false", "true"
-unusedBit_492_17 = bits, U32, 2116, [17:17], "false", "true"
-unusedBit_492_18 = bits, U32, 2116, [18:18], "false", "true"
-unusedBit_492_19 = bits, U32, 2116, [19:19], "false", "true"
-unusedBit_492_20 = bits, U32, 2116, [20:20], "false", "true"
-unusedBit_492_21 = bits, U32, 2116, [21:21], "false", "true"
-unusedBit_492_22 = bits, U32, 2116, [22:22], "false", "true"
-unusedBit_492_23 = bits, U32, 2116, [23:23], "false", "true"
-unusedBit_492_24 = bits, U32, 2116, [24:24], "false", "true"
-unusedBit_492_25 = bits, U32, 2116, [25:25], "false", "true"
-unusedBit_492_26 = bits, U32, 2116, [26:26], "false", "true"
-unusedBit_492_27 = bits, U32, 2116, [27:27], "false", "true"
-unusedBit_492_28 = bits, U32, 2116, [28:28], "false", "true"
-unusedBit_492_29 = bits, U32, 2116, [29:29], "false", "true"
-unusedBit_492_30 = bits, U32, 2116, [30:30], "false", "true"
-unusedBit_492_31 = bits, U32, 2116, [31:31], "false", "true"
+unusedBit_493_8 = bits, U32, 2116, [8:8], "false", "true"
+unusedBit_493_9 = bits, U32, 2116, [9:9], "false", "true"
+unusedBit_493_10 = bits, U32, 2116, [10:10], "false", "true"
+unusedBit_493_11 = bits, U32, 2116, [11:11], "false", "true"
+unusedBit_493_12 = bits, U32, 2116, [12:12], "false", "true"
+unusedBit_493_13 = bits, U32, 2116, [13:13], "false", "true"
+unusedBit_493_14 = bits, U32, 2116, [14:14], "false", "true"
+unusedBit_493_15 = bits, U32, 2116, [15:15], "false", "true"
+unusedBit_493_16 = bits, U32, 2116, [16:16], "false", "true"
+unusedBit_493_17 = bits, U32, 2116, [17:17], "false", "true"
+unusedBit_493_18 = bits, U32, 2116, [18:18], "false", "true"
+unusedBit_493_19 = bits, U32, 2116, [19:19], "false", "true"
+unusedBit_493_20 = bits, U32, 2116, [20:20], "false", "true"
+unusedBit_493_21 = bits, U32, 2116, [21:21], "false", "true"
+unusedBit_493_22 = bits, U32, 2116, [22:22], "false", "true"
+unusedBit_493_23 = bits, U32, 2116, [23:23], "false", "true"
+unusedBit_493_24 = bits, U32, 2116, [24:24], "false", "true"
+unusedBit_493_25 = bits, U32, 2116, [25:25], "false", "true"
+unusedBit_493_26 = bits, U32, 2116, [26:26], "false", "true"
+unusedBit_493_27 = bits, U32, 2116, [27:27], "false", "true"
+unusedBit_493_28 = bits, U32, 2116, [28:28], "false", "true"
+unusedBit_493_29 = bits, U32, 2116, [29:29], "false", "true"
+unusedBit_493_30 = bits, U32, 2116, [30:30], "false", "true"
+unusedBit_493_31 = bits, U32, 2116, [31:31], "false", "true"
 can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -1328,6 +1329,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2
 	cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel."
 	cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X"
 	ignitionDwellForCrankingMs = "Dwell duration while cranking"
+	etbRevLimitStart = "Once engine speed passes this value, start reducing ETB angle."
+	etbRevLimitRange = "This far above 'Soft limiter start', fully close the throttle. At the bottom of the range, throttle control is normal. At the top of the range, the throttle is fully closed."
 	clt_bias_resistor = "Pull-up resistor value on your board"
 	iat_bias_resistor = "Pull-up resistor value on your board"
 	hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields"
@@ -4494,13 +4497,19 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "Cut spark on RPM limit",				cutSparkOnHardLimit
         field = "RPM hard limit",                       rpmHardLimit, { cutFuelOnHardLimit || cutSparkOnHardLimit }
 		field = "Boost cut pressure",					boostCutPressure
-	
+
+	dialog = etbLimits, "Electronic Throttle Limiting"
+		field = "Smoothly close the throttle to limit RPM."
+		field = "Soft limiter start",				etbRevLimitStart
+		field = "Soft limiter range",				etbRevLimitRange
+
 	dialog = fallbacks, "Fallbacks"
 		field = "Use MAP estimation table as fallback",	enableMapEstimationTableFallback
 		field = "Failed MAP sensor fallback",			failedMapFallback, { !enableMapEstimationTableFallback }
 
 	dialog = limitsAndFallback, "Limits and fallbacks"
 		panel = limits
+		panel = etbLimits
 		panel = fallbacks
 	
 ;			Engine->Base Engine Settings
diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini
index ae35528755..69d11dc809 100644
--- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini
+++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.06.15.mre_f7.548168553"
+ 	signature    = "rusEFI 2021.06.16.mre_f7.3885896399"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.06.15.mre_f7.548168553" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.06.16.mre_f7.3885896399" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -77,7 +77,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 15 21:31:55 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 12:53:30 UTC 2021
 
 pageSize            = 20000
 page = 1
@@ -127,7 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0
 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0
 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1
 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1
-unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0
+etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0
+etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0
 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2
 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2
 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2
@@ -566,8 +567,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2"
 knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2"
 tcuEnabled = bits, U32, 976, [28:28], "false", "true"
 unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true"
-unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true"
-unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true"
+unusedBit_290_30 = bits, U32, 976, [30:30], "false", "true"
+unusedBit_290_31 = bits, U32, 976, [31:31], "false", "true"
 etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -855,30 +856,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true"
 unused1128 = bits, U32, 2116, [5:5], "false", "true"
 unused1129 = bits, U32, 2116, [6:6], "false", "true"
 unused1130 = bits, U32, 2116, [7:7], "false", "true"
-unusedBit_492_8 = bits, U32, 2116, [8:8], "false", "true"
-unusedBit_492_9 = bits, U32, 2116, [9:9], "false", "true"
-unusedBit_492_10 = bits, U32, 2116, [10:10], "false", "true"
-unusedBit_492_11 = bits, U32, 2116, [11:11], "false", "true"
-unusedBit_492_12 = bits, U32, 2116, [12:12], "false", "true"
-unusedBit_492_13 = bits, U32, 2116, [13:13], "false", "true"
-unusedBit_492_14 = bits, U32, 2116, [14:14], "false", "true"
-unusedBit_492_15 = bits, U32, 2116, [15:15], "false", "true"
-unusedBit_492_16 = bits, U32, 2116, [16:16], "false", "true"
-unusedBit_492_17 = bits, U32, 2116, [17:17], "false", "true"
-unusedBit_492_18 = bits, U32, 2116, [18:18], "false", "true"
-unusedBit_492_19 = bits, U32, 2116, [19:19], "false", "true"
-unusedBit_492_20 = bits, U32, 2116, [20:20], "false", "true"
-unusedBit_492_21 = bits, U32, 2116, [21:21], "false", "true"
-unusedBit_492_22 = bits, U32, 2116, [22:22], "false", "true"
-unusedBit_492_23 = bits, U32, 2116, [23:23], "false", "true"
-unusedBit_492_24 = bits, U32, 2116, [24:24], "false", "true"
-unusedBit_492_25 = bits, U32, 2116, [25:25], "false", "true"
-unusedBit_492_26 = bits, U32, 2116, [26:26], "false", "true"
-unusedBit_492_27 = bits, U32, 2116, [27:27], "false", "true"
-unusedBit_492_28 = bits, U32, 2116, [28:28], "false", "true"
-unusedBit_492_29 = bits, U32, 2116, [29:29], "false", "true"
-unusedBit_492_30 = bits, U32, 2116, [30:30], "false", "true"
-unusedBit_492_31 = bits, U32, 2116, [31:31], "false", "true"
+unusedBit_493_8 = bits, U32, 2116, [8:8], "false", "true"
+unusedBit_493_9 = bits, U32, 2116, [9:9], "false", "true"
+unusedBit_493_10 = bits, U32, 2116, [10:10], "false", "true"
+unusedBit_493_11 = bits, U32, 2116, [11:11], "false", "true"
+unusedBit_493_12 = bits, U32, 2116, [12:12], "false", "true"
+unusedBit_493_13 = bits, U32, 2116, [13:13], "false", "true"
+unusedBit_493_14 = bits, U32, 2116, [14:14], "false", "true"
+unusedBit_493_15 = bits, U32, 2116, [15:15], "false", "true"
+unusedBit_493_16 = bits, U32, 2116, [16:16], "false", "true"
+unusedBit_493_17 = bits, U32, 2116, [17:17], "false", "true"
+unusedBit_493_18 = bits, U32, 2116, [18:18], "false", "true"
+unusedBit_493_19 = bits, U32, 2116, [19:19], "false", "true"
+unusedBit_493_20 = bits, U32, 2116, [20:20], "false", "true"
+unusedBit_493_21 = bits, U32, 2116, [21:21], "false", "true"
+unusedBit_493_22 = bits, U32, 2116, [22:22], "false", "true"
+unusedBit_493_23 = bits, U32, 2116, [23:23], "false", "true"
+unusedBit_493_24 = bits, U32, 2116, [24:24], "false", "true"
+unusedBit_493_25 = bits, U32, 2116, [25:25], "false", "true"
+unusedBit_493_26 = bits, U32, 2116, [26:26], "false", "true"
+unusedBit_493_27 = bits, U32, 2116, [27:27], "false", "true"
+unusedBit_493_28 = bits, U32, 2116, [28:28], "false", "true"
+unusedBit_493_29 = bits, U32, 2116, [29:29], "false", "true"
+unusedBit_493_30 = bits, U32, 2116, [30:30], "false", "true"
+unusedBit_493_31 = bits, U32, 2116, [31:31], "false", "true"
 can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -1328,6 +1329,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2
 	cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel."
 	cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X"
 	ignitionDwellForCrankingMs = "Dwell duration while cranking"
+	etbRevLimitStart = "Once engine speed passes this value, start reducing ETB angle."
+	etbRevLimitRange = "This far above 'Soft limiter start', fully close the throttle. At the bottom of the range, throttle control is normal. At the top of the range, the throttle is fully closed."
 	clt_bias_resistor = "Pull-up resistor value on your board"
 	iat_bias_resistor = "Pull-up resistor value on your board"
 	hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields"
@@ -4494,13 +4497,19 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "Cut spark on RPM limit",				cutSparkOnHardLimit
         field = "RPM hard limit",                       rpmHardLimit, { cutFuelOnHardLimit || cutSparkOnHardLimit }
 		field = "Boost cut pressure",					boostCutPressure
-	
+
+	dialog = etbLimits, "Electronic Throttle Limiting"
+		field = "Smoothly close the throttle to limit RPM."
+		field = "Soft limiter start",				etbRevLimitStart
+		field = "Soft limiter range",				etbRevLimitRange
+
 	dialog = fallbacks, "Fallbacks"
 		field = "Use MAP estimation table as fallback",	enableMapEstimationTableFallback
 		field = "Failed MAP sensor fallback",			failedMapFallback, { !enableMapEstimationTableFallback }
 
 	dialog = limitsAndFallback, "Limits and fallbacks"
 		panel = limits
+		panel = etbLimits
 		panel = fallbacks
 	
 ;			Engine->Base Engine Settings
diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini
index 807b3bb14a..f9b3219c0c 100644
--- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini
+++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.06.15.prometheus_405.2968057925"
+ 	signature    = "rusEFI 2021.06.16.prometheus_405.2010810851"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.06.15.prometheus_405.2968057925" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.06.16.prometheus_405.2010810851" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -77,7 +77,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 15 21:32:02 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 12:53:36 UTC 2021
 
 pageSize            = 20000
 page = 1
@@ -127,7 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0
 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0
 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1
 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1
-unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0
+etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0
+etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0
 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2
 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2
 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2
@@ -566,8 +567,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2"
 knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2"
 tcuEnabled = bits, U32, 976, [28:28], "false", "true"
 unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true"
-unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true"
-unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true"
+unusedBit_290_30 = bits, U32, 976, [30:30], "false", "true"
+unusedBit_290_31 = bits, U32, 976, [31:31], "false", "true"
 etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -855,30 +856,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true"
 unused1128 = bits, U32, 2116, [5:5], "false", "true"
 unused1129 = bits, U32, 2116, [6:6], "false", "true"
 unused1130 = bits, U32, 2116, [7:7], "false", "true"
-unusedBit_492_8 = bits, U32, 2116, [8:8], "false", "true"
-unusedBit_492_9 = bits, U32, 2116, [9:9], "false", "true"
-unusedBit_492_10 = bits, U32, 2116, [10:10], "false", "true"
-unusedBit_492_11 = bits, U32, 2116, [11:11], "false", "true"
-unusedBit_492_12 = bits, U32, 2116, [12:12], "false", "true"
-unusedBit_492_13 = bits, U32, 2116, [13:13], "false", "true"
-unusedBit_492_14 = bits, U32, 2116, [14:14], "false", "true"
-unusedBit_492_15 = bits, U32, 2116, [15:15], "false", "true"
-unusedBit_492_16 = bits, U32, 2116, [16:16], "false", "true"
-unusedBit_492_17 = bits, U32, 2116, [17:17], "false", "true"
-unusedBit_492_18 = bits, U32, 2116, [18:18], "false", "true"
-unusedBit_492_19 = bits, U32, 2116, [19:19], "false", "true"
-unusedBit_492_20 = bits, U32, 2116, [20:20], "false", "true"
-unusedBit_492_21 = bits, U32, 2116, [21:21], "false", "true"
-unusedBit_492_22 = bits, U32, 2116, [22:22], "false", "true"
-unusedBit_492_23 = bits, U32, 2116, [23:23], "false", "true"
-unusedBit_492_24 = bits, U32, 2116, [24:24], "false", "true"
-unusedBit_492_25 = bits, U32, 2116, [25:25], "false", "true"
-unusedBit_492_26 = bits, U32, 2116, [26:26], "false", "true"
-unusedBit_492_27 = bits, U32, 2116, [27:27], "false", "true"
-unusedBit_492_28 = bits, U32, 2116, [28:28], "false", "true"
-unusedBit_492_29 = bits, U32, 2116, [29:29], "false", "true"
-unusedBit_492_30 = bits, U32, 2116, [30:30], "false", "true"
-unusedBit_492_31 = bits, U32, 2116, [31:31], "false", "true"
+unusedBit_493_8 = bits, U32, 2116, [8:8], "false", "true"
+unusedBit_493_9 = bits, U32, 2116, [9:9], "false", "true"
+unusedBit_493_10 = bits, U32, 2116, [10:10], "false", "true"
+unusedBit_493_11 = bits, U32, 2116, [11:11], "false", "true"
+unusedBit_493_12 = bits, U32, 2116, [12:12], "false", "true"
+unusedBit_493_13 = bits, U32, 2116, [13:13], "false", "true"
+unusedBit_493_14 = bits, U32, 2116, [14:14], "false", "true"
+unusedBit_493_15 = bits, U32, 2116, [15:15], "false", "true"
+unusedBit_493_16 = bits, U32, 2116, [16:16], "false", "true"
+unusedBit_493_17 = bits, U32, 2116, [17:17], "false", "true"
+unusedBit_493_18 = bits, U32, 2116, [18:18], "false", "true"
+unusedBit_493_19 = bits, U32, 2116, [19:19], "false", "true"
+unusedBit_493_20 = bits, U32, 2116, [20:20], "false", "true"
+unusedBit_493_21 = bits, U32, 2116, [21:21], "false", "true"
+unusedBit_493_22 = bits, U32, 2116, [22:22], "false", "true"
+unusedBit_493_23 = bits, U32, 2116, [23:23], "false", "true"
+unusedBit_493_24 = bits, U32, 2116, [24:24], "false", "true"
+unusedBit_493_25 = bits, U32, 2116, [25:25], "false", "true"
+unusedBit_493_26 = bits, U32, 2116, [26:26], "false", "true"
+unusedBit_493_27 = bits, U32, 2116, [27:27], "false", "true"
+unusedBit_493_28 = bits, U32, 2116, [28:28], "false", "true"
+unusedBit_493_29 = bits, U32, 2116, [29:29], "false", "true"
+unusedBit_493_30 = bits, U32, 2116, [30:30], "false", "true"
+unusedBit_493_31 = bits, U32, 2116, [31:31], "false", "true"
 can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -1328,6 +1329,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2
 	cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel."
 	cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X"
 	ignitionDwellForCrankingMs = "Dwell duration while cranking"
+	etbRevLimitStart = "Once engine speed passes this value, start reducing ETB angle."
+	etbRevLimitRange = "This far above 'Soft limiter start', fully close the throttle. At the bottom of the range, throttle control is normal. At the top of the range, the throttle is fully closed."
 	clt_bias_resistor = "Pull-up resistor value on your board"
 	iat_bias_resistor = "Pull-up resistor value on your board"
 	hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields"
@@ -4514,13 +4517,19 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "Cut spark on RPM limit",				cutSparkOnHardLimit
         field = "RPM hard limit",                       rpmHardLimit, { cutFuelOnHardLimit || cutSparkOnHardLimit }
 		field = "Boost cut pressure",					boostCutPressure
-	
+
+	dialog = etbLimits, "Electronic Throttle Limiting"
+		field = "Smoothly close the throttle to limit RPM."
+		field = "Soft limiter start",				etbRevLimitStart
+		field = "Soft limiter range",				etbRevLimitRange
+
 	dialog = fallbacks, "Fallbacks"
 		field = "Use MAP estimation table as fallback",	enableMapEstimationTableFallback
 		field = "Failed MAP sensor fallback",			failedMapFallback, { !enableMapEstimationTableFallback }
 
 	dialog = limitsAndFallback, "Limits and fallbacks"
 		panel = limits
+		panel = etbLimits
 		panel = fallbacks
 	
 ;			Engine->Base Engine Settings
diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini
index 6324e53cd5..1efd26cabe 100644
--- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini
+++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.06.15.prometheus_469.2968057925"
+ 	signature    = "rusEFI 2021.06.16.prometheus_469.2010810851"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.06.15.prometheus_469.2968057925" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.06.16.prometheus_469.2010810851" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -77,7 +77,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 15 21:32:01 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 12:53:35 UTC 2021
 
 pageSize            = 20000
 page = 1
@@ -127,7 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0
 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0
 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1
 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1
-unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0
+etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0
+etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0
 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2
 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2
 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2
@@ -566,8 +567,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2"
 knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2"
 tcuEnabled = bits, U32, 976, [28:28], "false", "true"
 unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true"
-unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true"
-unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true"
+unusedBit_290_30 = bits, U32, 976, [30:30], "false", "true"
+unusedBit_290_31 = bits, U32, 976, [31:31], "false", "true"
 etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -855,30 +856,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true"
 unused1128 = bits, U32, 2116, [5:5], "false", "true"
 unused1129 = bits, U32, 2116, [6:6], "false", "true"
 unused1130 = bits, U32, 2116, [7:7], "false", "true"
-unusedBit_492_8 = bits, U32, 2116, [8:8], "false", "true"
-unusedBit_492_9 = bits, U32, 2116, [9:9], "false", "true"
-unusedBit_492_10 = bits, U32, 2116, [10:10], "false", "true"
-unusedBit_492_11 = bits, U32, 2116, [11:11], "false", "true"
-unusedBit_492_12 = bits, U32, 2116, [12:12], "false", "true"
-unusedBit_492_13 = bits, U32, 2116, [13:13], "false", "true"
-unusedBit_492_14 = bits, U32, 2116, [14:14], "false", "true"
-unusedBit_492_15 = bits, U32, 2116, [15:15], "false", "true"
-unusedBit_492_16 = bits, U32, 2116, [16:16], "false", "true"
-unusedBit_492_17 = bits, U32, 2116, [17:17], "false", "true"
-unusedBit_492_18 = bits, U32, 2116, [18:18], "false", "true"
-unusedBit_492_19 = bits, U32, 2116, [19:19], "false", "true"
-unusedBit_492_20 = bits, U32, 2116, [20:20], "false", "true"
-unusedBit_492_21 = bits, U32, 2116, [21:21], "false", "true"
-unusedBit_492_22 = bits, U32, 2116, [22:22], "false", "true"
-unusedBit_492_23 = bits, U32, 2116, [23:23], "false", "true"
-unusedBit_492_24 = bits, U32, 2116, [24:24], "false", "true"
-unusedBit_492_25 = bits, U32, 2116, [25:25], "false", "true"
-unusedBit_492_26 = bits, U32, 2116, [26:26], "false", "true"
-unusedBit_492_27 = bits, U32, 2116, [27:27], "false", "true"
-unusedBit_492_28 = bits, U32, 2116, [28:28], "false", "true"
-unusedBit_492_29 = bits, U32, 2116, [29:29], "false", "true"
-unusedBit_492_30 = bits, U32, 2116, [30:30], "false", "true"
-unusedBit_492_31 = bits, U32, 2116, [31:31], "false", "true"
+unusedBit_493_8 = bits, U32, 2116, [8:8], "false", "true"
+unusedBit_493_9 = bits, U32, 2116, [9:9], "false", "true"
+unusedBit_493_10 = bits, U32, 2116, [10:10], "false", "true"
+unusedBit_493_11 = bits, U32, 2116, [11:11], "false", "true"
+unusedBit_493_12 = bits, U32, 2116, [12:12], "false", "true"
+unusedBit_493_13 = bits, U32, 2116, [13:13], "false", "true"
+unusedBit_493_14 = bits, U32, 2116, [14:14], "false", "true"
+unusedBit_493_15 = bits, U32, 2116, [15:15], "false", "true"
+unusedBit_493_16 = bits, U32, 2116, [16:16], "false", "true"
+unusedBit_493_17 = bits, U32, 2116, [17:17], "false", "true"
+unusedBit_493_18 = bits, U32, 2116, [18:18], "false", "true"
+unusedBit_493_19 = bits, U32, 2116, [19:19], "false", "true"
+unusedBit_493_20 = bits, U32, 2116, [20:20], "false", "true"
+unusedBit_493_21 = bits, U32, 2116, [21:21], "false", "true"
+unusedBit_493_22 = bits, U32, 2116, [22:22], "false", "true"
+unusedBit_493_23 = bits, U32, 2116, [23:23], "false", "true"
+unusedBit_493_24 = bits, U32, 2116, [24:24], "false", "true"
+unusedBit_493_25 = bits, U32, 2116, [25:25], "false", "true"
+unusedBit_493_26 = bits, U32, 2116, [26:26], "false", "true"
+unusedBit_493_27 = bits, U32, 2116, [27:27], "false", "true"
+unusedBit_493_28 = bits, U32, 2116, [28:28], "false", "true"
+unusedBit_493_29 = bits, U32, 2116, [29:29], "false", "true"
+unusedBit_493_30 = bits, U32, 2116, [30:30], "false", "true"
+unusedBit_493_31 = bits, U32, 2116, [31:31], "false", "true"
 can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -1328,6 +1329,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2
 	cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel."
 	cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X"
 	ignitionDwellForCrankingMs = "Dwell duration while cranking"
+	etbRevLimitStart = "Once engine speed passes this value, start reducing ETB angle."
+	etbRevLimitRange = "This far above 'Soft limiter start', fully close the throttle. At the bottom of the range, throttle control is normal. At the top of the range, the throttle is fully closed."
 	clt_bias_resistor = "Pull-up resistor value on your board"
 	iat_bias_resistor = "Pull-up resistor value on your board"
 	hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields"
@@ -4514,13 +4517,19 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "Cut spark on RPM limit",				cutSparkOnHardLimit
         field = "RPM hard limit",                       rpmHardLimit, { cutFuelOnHardLimit || cutSparkOnHardLimit }
 		field = "Boost cut pressure",					boostCutPressure
-	
+
+	dialog = etbLimits, "Electronic Throttle Limiting"
+		field = "Smoothly close the throttle to limit RPM."
+		field = "Soft limiter start",				etbRevLimitStart
+		field = "Soft limiter range",				etbRevLimitRange
+
 	dialog = fallbacks, "Fallbacks"
 		field = "Use MAP estimation table as fallback",	enableMapEstimationTableFallback
 		field = "Failed MAP sensor fallback",			failedMapFallback, { !enableMapEstimationTableFallback }
 
 	dialog = limitsAndFallback, "Limits and fallbacks"
 		panel = limits
+		panel = etbLimits
 		panel = fallbacks
 	
 ;			Engine->Base Engine Settings
diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini
index 53254aeeea..78cb1558e6 100644
--- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini
+++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.06.15.proteus_f4.3418900328"
+ 	signature    = "rusEFI 2021.06.16.proteus_f4.217724622"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.06.15.proteus_f4.3418900328" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.06.16.proteus_f4.217724622" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -77,7 +77,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 15 21:32:06 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 12:53:39 UTC 2021
 
 pageSize            = 20000
 page = 1
@@ -127,7 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0
 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0
 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1
 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1
-unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0
+etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0
+etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0
 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2
 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2
 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2
@@ -566,8 +567,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2"
 knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2"
 tcuEnabled = bits, U32, 976, [28:28], "false", "true"
 unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true"
-unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true"
-unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true"
+unusedBit_290_30 = bits, U32, 976, [30:30], "false", "true"
+unusedBit_290_31 = bits, U32, 976, [31:31], "false", "true"
 etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -855,30 +856,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true"
 unused1128 = bits, U32, 2116, [5:5], "false", "true"
 unused1129 = bits, U32, 2116, [6:6], "false", "true"
 unused1130 = bits, U32, 2116, [7:7], "false", "true"
-unusedBit_492_8 = bits, U32, 2116, [8:8], "false", "true"
-unusedBit_492_9 = bits, U32, 2116, [9:9], "false", "true"
-unusedBit_492_10 = bits, U32, 2116, [10:10], "false", "true"
-unusedBit_492_11 = bits, U32, 2116, [11:11], "false", "true"
-unusedBit_492_12 = bits, U32, 2116, [12:12], "false", "true"
-unusedBit_492_13 = bits, U32, 2116, [13:13], "false", "true"
-unusedBit_492_14 = bits, U32, 2116, [14:14], "false", "true"
-unusedBit_492_15 = bits, U32, 2116, [15:15], "false", "true"
-unusedBit_492_16 = bits, U32, 2116, [16:16], "false", "true"
-unusedBit_492_17 = bits, U32, 2116, [17:17], "false", "true"
-unusedBit_492_18 = bits, U32, 2116, [18:18], "false", "true"
-unusedBit_492_19 = bits, U32, 2116, [19:19], "false", "true"
-unusedBit_492_20 = bits, U32, 2116, [20:20], "false", "true"
-unusedBit_492_21 = bits, U32, 2116, [21:21], "false", "true"
-unusedBit_492_22 = bits, U32, 2116, [22:22], "false", "true"
-unusedBit_492_23 = bits, U32, 2116, [23:23], "false", "true"
-unusedBit_492_24 = bits, U32, 2116, [24:24], "false", "true"
-unusedBit_492_25 = bits, U32, 2116, [25:25], "false", "true"
-unusedBit_492_26 = bits, U32, 2116, [26:26], "false", "true"
-unusedBit_492_27 = bits, U32, 2116, [27:27], "false", "true"
-unusedBit_492_28 = bits, U32, 2116, [28:28], "false", "true"
-unusedBit_492_29 = bits, U32, 2116, [29:29], "false", "true"
-unusedBit_492_30 = bits, U32, 2116, [30:30], "false", "true"
-unusedBit_492_31 = bits, U32, 2116, [31:31], "false", "true"
+unusedBit_493_8 = bits, U32, 2116, [8:8], "false", "true"
+unusedBit_493_9 = bits, U32, 2116, [9:9], "false", "true"
+unusedBit_493_10 = bits, U32, 2116, [10:10], "false", "true"
+unusedBit_493_11 = bits, U32, 2116, [11:11], "false", "true"
+unusedBit_493_12 = bits, U32, 2116, [12:12], "false", "true"
+unusedBit_493_13 = bits, U32, 2116, [13:13], "false", "true"
+unusedBit_493_14 = bits, U32, 2116, [14:14], "false", "true"
+unusedBit_493_15 = bits, U32, 2116, [15:15], "false", "true"
+unusedBit_493_16 = bits, U32, 2116, [16:16], "false", "true"
+unusedBit_493_17 = bits, U32, 2116, [17:17], "false", "true"
+unusedBit_493_18 = bits, U32, 2116, [18:18], "false", "true"
+unusedBit_493_19 = bits, U32, 2116, [19:19], "false", "true"
+unusedBit_493_20 = bits, U32, 2116, [20:20], "false", "true"
+unusedBit_493_21 = bits, U32, 2116, [21:21], "false", "true"
+unusedBit_493_22 = bits, U32, 2116, [22:22], "false", "true"
+unusedBit_493_23 = bits, U32, 2116, [23:23], "false", "true"
+unusedBit_493_24 = bits, U32, 2116, [24:24], "false", "true"
+unusedBit_493_25 = bits, U32, 2116, [25:25], "false", "true"
+unusedBit_493_26 = bits, U32, 2116, [26:26], "false", "true"
+unusedBit_493_27 = bits, U32, 2116, [27:27], "false", "true"
+unusedBit_493_28 = bits, U32, 2116, [28:28], "false", "true"
+unusedBit_493_29 = bits, U32, 2116, [29:29], "false", "true"
+unusedBit_493_30 = bits, U32, 2116, [30:30], "false", "true"
+unusedBit_493_31 = bits, U32, 2116, [31:31], "false", "true"
 can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -1328,6 +1329,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2
 	cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel."
 	cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X"
 	ignitionDwellForCrankingMs = "Dwell duration while cranking"
+	etbRevLimitStart = "Once engine speed passes this value, start reducing ETB angle."
+	etbRevLimitRange = "This far above 'Soft limiter start', fully close the throttle. At the bottom of the range, throttle control is normal. At the top of the range, the throttle is fully closed."
 	clt_bias_resistor = "Pull-up resistor value on your board"
 	iat_bias_resistor = "Pull-up resistor value on your board"
 	hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields"
@@ -4486,13 +4489,19 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "Cut spark on RPM limit",				cutSparkOnHardLimit
         field = "RPM hard limit",                       rpmHardLimit, { cutFuelOnHardLimit || cutSparkOnHardLimit }
 		field = "Boost cut pressure",					boostCutPressure
-	
+
+	dialog = etbLimits, "Electronic Throttle Limiting"
+		field = "Smoothly close the throttle to limit RPM."
+		field = "Soft limiter start",				etbRevLimitStart
+		field = "Soft limiter range",				etbRevLimitRange
+
 	dialog = fallbacks, "Fallbacks"
 		field = "Use MAP estimation table as fallback",	enableMapEstimationTableFallback
 		field = "Failed MAP sensor fallback",			failedMapFallback, { !enableMapEstimationTableFallback }
 
 	dialog = limitsAndFallback, "Limits and fallbacks"
 		panel = limits
+		panel = etbLimits
 		panel = fallbacks
 	
 ;			Engine->Base Engine Settings
diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini
index 7443a8c184..06811c139d 100644
--- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini
+++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.06.15.proteus_f7.3418900328"
+ 	signature    = "rusEFI 2021.06.16.proteus_f7.217724622"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.06.15.proteus_f7.3418900328" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.06.16.proteus_f7.217724622" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -77,7 +77,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 15 21:32:04 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 12:53:38 UTC 2021
 
 pageSize            = 20000
 page = 1
@@ -127,7 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0
 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0
 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1
 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1
-unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0
+etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0
+etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0
 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2
 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2
 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2
@@ -566,8 +567,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2"
 knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2"
 tcuEnabled = bits, U32, 976, [28:28], "false", "true"
 unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true"
-unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true"
-unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true"
+unusedBit_290_30 = bits, U32, 976, [30:30], "false", "true"
+unusedBit_290_31 = bits, U32, 976, [31:31], "false", "true"
 etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -855,30 +856,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true"
 unused1128 = bits, U32, 2116, [5:5], "false", "true"
 unused1129 = bits, U32, 2116, [6:6], "false", "true"
 unused1130 = bits, U32, 2116, [7:7], "false", "true"
-unusedBit_492_8 = bits, U32, 2116, [8:8], "false", "true"
-unusedBit_492_9 = bits, U32, 2116, [9:9], "false", "true"
-unusedBit_492_10 = bits, U32, 2116, [10:10], "false", "true"
-unusedBit_492_11 = bits, U32, 2116, [11:11], "false", "true"
-unusedBit_492_12 = bits, U32, 2116, [12:12], "false", "true"
-unusedBit_492_13 = bits, U32, 2116, [13:13], "false", "true"
-unusedBit_492_14 = bits, U32, 2116, [14:14], "false", "true"
-unusedBit_492_15 = bits, U32, 2116, [15:15], "false", "true"
-unusedBit_492_16 = bits, U32, 2116, [16:16], "false", "true"
-unusedBit_492_17 = bits, U32, 2116, [17:17], "false", "true"
-unusedBit_492_18 = bits, U32, 2116, [18:18], "false", "true"
-unusedBit_492_19 = bits, U32, 2116, [19:19], "false", "true"
-unusedBit_492_20 = bits, U32, 2116, [20:20], "false", "true"
-unusedBit_492_21 = bits, U32, 2116, [21:21], "false", "true"
-unusedBit_492_22 = bits, U32, 2116, [22:22], "false", "true"
-unusedBit_492_23 = bits, U32, 2116, [23:23], "false", "true"
-unusedBit_492_24 = bits, U32, 2116, [24:24], "false", "true"
-unusedBit_492_25 = bits, U32, 2116, [25:25], "false", "true"
-unusedBit_492_26 = bits, U32, 2116, [26:26], "false", "true"
-unusedBit_492_27 = bits, U32, 2116, [27:27], "false", "true"
-unusedBit_492_28 = bits, U32, 2116, [28:28], "false", "true"
-unusedBit_492_29 = bits, U32, 2116, [29:29], "false", "true"
-unusedBit_492_30 = bits, U32, 2116, [30:30], "false", "true"
-unusedBit_492_31 = bits, U32, 2116, [31:31], "false", "true"
+unusedBit_493_8 = bits, U32, 2116, [8:8], "false", "true"
+unusedBit_493_9 = bits, U32, 2116, [9:9], "false", "true"
+unusedBit_493_10 = bits, U32, 2116, [10:10], "false", "true"
+unusedBit_493_11 = bits, U32, 2116, [11:11], "false", "true"
+unusedBit_493_12 = bits, U32, 2116, [12:12], "false", "true"
+unusedBit_493_13 = bits, U32, 2116, [13:13], "false", "true"
+unusedBit_493_14 = bits, U32, 2116, [14:14], "false", "true"
+unusedBit_493_15 = bits, U32, 2116, [15:15], "false", "true"
+unusedBit_493_16 = bits, U32, 2116, [16:16], "false", "true"
+unusedBit_493_17 = bits, U32, 2116, [17:17], "false", "true"
+unusedBit_493_18 = bits, U32, 2116, [18:18], "false", "true"
+unusedBit_493_19 = bits, U32, 2116, [19:19], "false", "true"
+unusedBit_493_20 = bits, U32, 2116, [20:20], "false", "true"
+unusedBit_493_21 = bits, U32, 2116, [21:21], "false", "true"
+unusedBit_493_22 = bits, U32, 2116, [22:22], "false", "true"
+unusedBit_493_23 = bits, U32, 2116, [23:23], "false", "true"
+unusedBit_493_24 = bits, U32, 2116, [24:24], "false", "true"
+unusedBit_493_25 = bits, U32, 2116, [25:25], "false", "true"
+unusedBit_493_26 = bits, U32, 2116, [26:26], "false", "true"
+unusedBit_493_27 = bits, U32, 2116, [27:27], "false", "true"
+unusedBit_493_28 = bits, U32, 2116, [28:28], "false", "true"
+unusedBit_493_29 = bits, U32, 2116, [29:29], "false", "true"
+unusedBit_493_30 = bits, U32, 2116, [30:30], "false", "true"
+unusedBit_493_31 = bits, U32, 2116, [31:31], "false", "true"
 can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -1328,6 +1329,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2
 	cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel."
 	cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X"
 	ignitionDwellForCrankingMs = "Dwell duration while cranking"
+	etbRevLimitStart = "Once engine speed passes this value, start reducing ETB angle."
+	etbRevLimitRange = "This far above 'Soft limiter start', fully close the throttle. At the bottom of the range, throttle control is normal. At the top of the range, the throttle is fully closed."
 	clt_bias_resistor = "Pull-up resistor value on your board"
 	iat_bias_resistor = "Pull-up resistor value on your board"
 	hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields"
@@ -4486,13 +4489,19 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "Cut spark on RPM limit",				cutSparkOnHardLimit
         field = "RPM hard limit",                       rpmHardLimit, { cutFuelOnHardLimit || cutSparkOnHardLimit }
 		field = "Boost cut pressure",					boostCutPressure
-	
+
+	dialog = etbLimits, "Electronic Throttle Limiting"
+		field = "Smoothly close the throttle to limit RPM."
+		field = "Soft limiter start",				etbRevLimitStart
+		field = "Soft limiter range",				etbRevLimitRange
+
 	dialog = fallbacks, "Fallbacks"
 		field = "Use MAP estimation table as fallback",	enableMapEstimationTableFallback
 		field = "Failed MAP sensor fallback",			failedMapFallback, { !enableMapEstimationTableFallback }
 
 	dialog = limitsAndFallback, "Limits and fallbacks"
 		panel = limits
+		panel = etbLimits
 		panel = fallbacks
 	
 ;			Engine->Base Engine Settings
diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini
index c98d9c92cd..86729bb459 100644
--- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini
+++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2021.06.15.subaru_eg33_f7.253949029"
+ 	signature    = "rusEFI 2021.06.16.subaru_eg33_f7.3356526019"
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2021.06.15.subaru_eg33_f7.253949029" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2021.06.16.subaru_eg33_f7.3356526019" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -77,7 +77,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Tue Jun 15 21:32:11 UTC 2021
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Jun 16 12:53:43 UTC 2021
 
 pageSize            = 20000
 page = 1
@@ -127,7 +127,8 @@ cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0
 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0
 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1
 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1
-unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0
+etbRevLimitStart = scalar, U16, 104, 1, 0.0, 0, 15000, 0
+etbRevLimitRange = scalar, U16, 106, 1, 0.0, 0, 2000, 0
 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2
 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2
 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2
@@ -566,8 +567,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2"
 knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2"
 tcuEnabled = bits, U32, 976, [28:28], "false", "true"
 unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true"
-unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true"
-unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true"
+unusedBit_290_30 = bits, U32, 976, [30:30], "false", "true"
+unusedBit_290_31 = bits, U32, 976, [31:31], "false", "true"
 etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -855,30 +856,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true"
 unused1128 = bits, U32, 2116, [5:5], "false", "true"
 unused1129 = bits, U32, 2116, [6:6], "false", "true"
 unused1130 = bits, U32, 2116, [7:7], "false", "true"
-unusedBit_492_8 = bits, U32, 2116, [8:8], "false", "true"
-unusedBit_492_9 = bits, U32, 2116, [9:9], "false", "true"
-unusedBit_492_10 = bits, U32, 2116, [10:10], "false", "true"
-unusedBit_492_11 = bits, U32, 2116, [11:11], "false", "true"
-unusedBit_492_12 = bits, U32, 2116, [12:12], "false", "true"
-unusedBit_492_13 = bits, U32, 2116, [13:13], "false", "true"
-unusedBit_492_14 = bits, U32, 2116, [14:14], "false", "true"
-unusedBit_492_15 = bits, U32, 2116, [15:15], "false", "true"
-unusedBit_492_16 = bits, U32, 2116, [16:16], "false", "true"
-unusedBit_492_17 = bits, U32, 2116, [17:17], "false", "true"
-unusedBit_492_18 = bits, U32, 2116, [18:18], "false", "true"
-unusedBit_492_19 = bits, U32, 2116, [19:19], "false", "true"
-unusedBit_492_20 = bits, U32, 2116, [20:20], "false", "true"
-unusedBit_492_21 = bits, U32, 2116, [21:21], "false", "true"
-unusedBit_492_22 = bits, U32, 2116, [22:22], "false", "true"
-unusedBit_492_23 = bits, U32, 2116, [23:23], "false", "true"
-unusedBit_492_24 = bits, U32, 2116, [24:24], "false", "true"
-unusedBit_492_25 = bits, U32, 2116, [25:25], "false", "true"
-unusedBit_492_26 = bits, U32, 2116, [26:26], "false", "true"
-unusedBit_492_27 = bits, U32, 2116, [27:27], "false", "true"
-unusedBit_492_28 = bits, U32, 2116, [28:28], "false", "true"
-unusedBit_492_29 = bits, U32, 2116, [29:29], "false", "true"
-unusedBit_492_30 = bits, U32, 2116, [30:30], "false", "true"
-unusedBit_492_31 = bits, U32, 2116, [31:31], "false", "true"
+unusedBit_493_8 = bits, U32, 2116, [8:8], "false", "true"
+unusedBit_493_9 = bits, U32, 2116, [9:9], "false", "true"
+unusedBit_493_10 = bits, U32, 2116, [10:10], "false", "true"
+unusedBit_493_11 = bits, U32, 2116, [11:11], "false", "true"
+unusedBit_493_12 = bits, U32, 2116, [12:12], "false", "true"
+unusedBit_493_13 = bits, U32, 2116, [13:13], "false", "true"
+unusedBit_493_14 = bits, U32, 2116, [14:14], "false", "true"
+unusedBit_493_15 = bits, U32, 2116, [15:15], "false", "true"
+unusedBit_493_16 = bits, U32, 2116, [16:16], "false", "true"
+unusedBit_493_17 = bits, U32, 2116, [17:17], "false", "true"
+unusedBit_493_18 = bits, U32, 2116, [18:18], "false", "true"
+unusedBit_493_19 = bits, U32, 2116, [19:19], "false", "true"
+unusedBit_493_20 = bits, U32, 2116, [20:20], "false", "true"
+unusedBit_493_21 = bits, U32, 2116, [21:21], "false", "true"
+unusedBit_493_22 = bits, U32, 2116, [22:22], "false", "true"
+unusedBit_493_23 = bits, U32, 2116, [23:23], "false", "true"
+unusedBit_493_24 = bits, U32, 2116, [24:24], "false", "true"
+unusedBit_493_25 = bits, U32, 2116, [25:25], "false", "true"
+unusedBit_493_26 = bits, U32, 2116, [26:26], "false", "true"
+unusedBit_493_27 = bits, U32, 2116, [27:27], "false", "true"
+unusedBit_493_28 = bits, U32, 2116, [28:28], "false", "true"
+unusedBit_493_29 = bits, U32, 2116, [29:29], "false", "true"
+unusedBit_493_30 = bits, U32, 2116, [30:30], "false", "true"
+unusedBit_493_31 = bits, U32, 2116, [31:31], "false", "true"
 can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -1328,6 +1329,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2
 	cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel."
 	cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X"
 	ignitionDwellForCrankingMs = "Dwell duration while cranking"
+	etbRevLimitStart = "Once engine speed passes this value, start reducing ETB angle."
+	etbRevLimitRange = "This far above 'Soft limiter start', fully close the throttle. At the bottom of the range, throttle control is normal. At the top of the range, the throttle is fully closed."
 	clt_bias_resistor = "Pull-up resistor value on your board"
 	iat_bias_resistor = "Pull-up resistor value on your board"
 	hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields"
@@ -4510,13 +4513,19 @@ cmd_set_engine_type_default					= "Z\x00\x31\x00\x00"
 		field = "Cut spark on RPM limit",				cutSparkOnHardLimit
         field = "RPM hard limit",                       rpmHardLimit, { cutFuelOnHardLimit || cutSparkOnHardLimit }
 		field = "Boost cut pressure",					boostCutPressure
-	
+
+	dialog = etbLimits, "Electronic Throttle Limiting"
+		field = "Smoothly close the throttle to limit RPM."
+		field = "Soft limiter start",				etbRevLimitStart
+		field = "Soft limiter range",				etbRevLimitRange
+
 	dialog = fallbacks, "Fallbacks"
 		field = "Use MAP estimation table as fallback",	enableMapEstimationTableFallback
 		field = "Failed MAP sensor fallback",			failedMapFallback, { !enableMapEstimationTableFallback }
 
 	dialog = limitsAndFallback, "Limits and fallbacks"
 		panel = limits
+		panel = etbLimits
 		panel = fallbacks
 	
 ;			Engine->Base Engine Settings
diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java
index a7a2528ee6..6df019f1cd 100644
--- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java
@@ -1,6 +1,6 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 15 21:31:42 UTC 2021
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 16 12:53:19 UTC 2021
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
@@ -462,6 +462,8 @@ public class Fields {
 	public static final int etbIo2_disablePin_offset = 987;
 	public static final int etbIo2_offset = 984;
 	public static final int etbNeutralPosition_offset = 1471;
+	public static final int etbRevLimitRange_offset = 106;
+	public static final int etbRevLimitStart_offset = 104;
 	public static final int etbWastegatePid_dFactor_offset = 2524;
 	public static final int etbWastegatePid_iFactor_offset = 2520;
 	public static final int etbWastegatePid_maxValue_offset = 2534;
@@ -1237,6 +1239,7 @@ public class Fields {
 	public static final int servoOutputPins8_offset = 3147;
 	public static final int showHumanReadableWarning_offset = 976;
 	public static final int showSdCardWarning_offset = 76;
+	public static final int SIGNATURE_HASH = 1699515349;
 	public static final int silentTriggerError_offset = 1464;
 	public static final int slowAdcAlpha_offset = 2088;
 	public static final int sparkDwellRpmBins_offset = 332;
@@ -1538,7 +1541,7 @@ public class Fields {
 	public static final char TS_SD_R_COMMAND = 'r';
 	public static final char TS_SD_W_COMMAND = 'w';
 	public static final char TS_SET_LOGGER_SWITCH = 'l';
-	public static final String TS_SIGNATURE = "rusEFI 2021.06.15.all.2726230643";
+	public static final String TS_SIGNATURE = "rusEFI 2021.06.16.all.1699515349";
 	public static final char TS_SINGLE_WRITE_COMMAND = 'W';
 	public static final int TT_TT_1_16 = 50;
 	public static final int TT_TT_2JZ_1_12 = 29;
@@ -1588,7 +1591,6 @@ public class Fields {
 	public static final int twoWireBatchIgnition_offset = 1476;
 	public static final int twoWireBatchInjection_offset = 1476;
 	public static final int uartConsoleSerialSpeed_offset = 2076;
-	public static final int unused104_offset = 104;
 	public static final int unused1059_offset = 3964;
 	public static final int unused1126_offset = 2116;
 	public static final int unused1127_offset = 2116;
@@ -1633,33 +1635,33 @@ public class Fields {
 	public static final int unusedAtOldBoardConfigurationEnd_offset = 1228;
 	public static final int unusedBit4_1476_offset = 1476;
 	public static final int unusedBit_251_29_offset = 976;
-	public static final int unusedBit_289_30_offset = 976;
-	public static final int unusedBit_289_31_offset = 976;
+	public static final int unusedBit_290_30_offset = 976;
+	public static final int unusedBit_290_31_offset = 976;
 	public static final int unusedBit_34_31_offset = 76;
-	public static final int unusedBit_492_10_offset = 2116;
-	public static final int unusedBit_492_11_offset = 2116;
-	public static final int unusedBit_492_12_offset = 2116;
-	public static final int unusedBit_492_13_offset = 2116;
-	public static final int unusedBit_492_14_offset = 2116;
-	public static final int unusedBit_492_15_offset = 2116;
-	public static final int unusedBit_492_16_offset = 2116;
-	public static final int unusedBit_492_17_offset = 2116;
-	public static final int unusedBit_492_18_offset = 2116;
-	public static final int unusedBit_492_19_offset = 2116;
-	public static final int unusedBit_492_20_offset = 2116;
-	public static final int unusedBit_492_21_offset = 2116;
-	public static final int unusedBit_492_22_offset = 2116;
-	public static final int unusedBit_492_23_offset = 2116;
-	public static final int unusedBit_492_24_offset = 2116;
-	public static final int unusedBit_492_25_offset = 2116;
-	public static final int unusedBit_492_26_offset = 2116;
-	public static final int unusedBit_492_27_offset = 2116;
-	public static final int unusedBit_492_28_offset = 2116;
-	public static final int unusedBit_492_29_offset = 2116;
-	public static final int unusedBit_492_30_offset = 2116;
-	public static final int unusedBit_492_31_offset = 2116;
-	public static final int unusedBit_492_8_offset = 2116;
-	public static final int unusedBit_492_9_offset = 2116;
+	public static final int unusedBit_493_10_offset = 2116;
+	public static final int unusedBit_493_11_offset = 2116;
+	public static final int unusedBit_493_12_offset = 2116;
+	public static final int unusedBit_493_13_offset = 2116;
+	public static final int unusedBit_493_14_offset = 2116;
+	public static final int unusedBit_493_15_offset = 2116;
+	public static final int unusedBit_493_16_offset = 2116;
+	public static final int unusedBit_493_17_offset = 2116;
+	public static final int unusedBit_493_18_offset = 2116;
+	public static final int unusedBit_493_19_offset = 2116;
+	public static final int unusedBit_493_20_offset = 2116;
+	public static final int unusedBit_493_21_offset = 2116;
+	public static final int unusedBit_493_22_offset = 2116;
+	public static final int unusedBit_493_23_offset = 2116;
+	public static final int unusedBit_493_24_offset = 2116;
+	public static final int unusedBit_493_25_offset = 2116;
+	public static final int unusedBit_493_26_offset = 2116;
+	public static final int unusedBit_493_27_offset = 2116;
+	public static final int unusedBit_493_28_offset = 2116;
+	public static final int unusedBit_493_29_offset = 2116;
+	public static final int unusedBit_493_30_offset = 2116;
+	public static final int unusedBit_493_31_offset = 2116;
+	public static final int unusedBit_493_8_offset = 2116;
+	public static final int unusedBit_493_9_offset = 2116;
 	public static final int unusedOldBiquad_offset = 2331;
 	public static final int unusedOldIgnitionOffset_offset = 445;
 	public static final int unusedSpiPadding4_offset = 2593;
@@ -1783,7 +1785,8 @@ public class Fields {
 	public static final Field CRANKING_RPM = Field.create("CRANKING_RPM", 92, FieldType.INT16);
 	public static final Field PRIMINGSQUIRTDURATIONMS = Field.create("PRIMINGSQUIRTDURATIONMS", 96, FieldType.FLOAT);
 	public static final Field IGNITIONDWELLFORCRANKINGMS = Field.create("IGNITIONDWELLFORCRANKINGMS", 100, FieldType.FLOAT);
-	public static final Field UNUSED104 = Field.create("UNUSED104", 104, FieldType.FLOAT);
+	public static final Field ETBREVLIMITSTART = Field.create("ETBREVLIMITSTART", 104, FieldType.INT16);
+	public static final Field ETBREVLIMITRANGE = Field.create("ETBREVLIMITRANGE", 106, FieldType.INT16);
 	public static final Field MAP_SENSOR_LOWVALUE = Field.create("MAP_SENSOR_LOWVALUE", 236, FieldType.FLOAT);
 	public static final Field MAP_SENSOR_HIGHVALUE = Field.create("MAP_SENSOR_HIGHVALUE", 240, FieldType.FLOAT);
 	public static final Field MAP_SENSOR_TYPE = Field.create("MAP_SENSOR_TYPE", 244, FieldType.INT);
@@ -2220,8 +2223,8 @@ public class Fields {
 	public static final Field KNOCKBANKCYL12 = Field.create("KNOCKBANKCYL12", 976, FieldType.BIT, 27);
 	public static final Field TCUENABLED = Field.create("TCUENABLED", 976, FieldType.BIT, 28);
 	public static final Field UNUSEDBIT_251_29 = Field.create("UNUSEDBIT_251_29", 976, FieldType.BIT, 29);
-	public static final Field UNUSEDBIT_289_30 = Field.create("UNUSEDBIT_289_30", 976, FieldType.BIT, 30);
-	public static final Field UNUSEDBIT_289_31 = Field.create("UNUSEDBIT_289_31", 976, FieldType.BIT, 31);
+	public static final Field UNUSEDBIT_290_30 = Field.create("UNUSEDBIT_290_30", 976, FieldType.BIT, 30);
+	public static final Field UNUSEDBIT_290_31 = Field.create("UNUSEDBIT_290_31", 976, FieldType.BIT, 31);
 	public static final Field ETBIO1_DIRECTIONPIN1 = Field.create("ETBIO1_DIRECTIONPIN1", 980, FieldType.INT8, brain_pin_e);
 	public static final Field ETBIO1_DIRECTIONPIN2 = Field.create("ETBIO1_DIRECTIONPIN2", 981, FieldType.INT8, brain_pin_e);
 	public static final Field ETBIO1_CONTROLPIN = Field.create("ETBIO1_CONTROLPIN", 982, FieldType.INT8, brain_pin_e);
@@ -2505,30 +2508,30 @@ public class Fields {
 	public static final Field UNUSED1128 = Field.create("UNUSED1128", 2116, FieldType.BIT, 5);
 	public static final Field UNUSED1129 = Field.create("UNUSED1129", 2116, FieldType.BIT, 6);
 	public static final Field UNUSED1130 = Field.create("UNUSED1130", 2116, FieldType.BIT, 7);
-	public static final Field UNUSEDBIT_492_8 = Field.create("UNUSEDBIT_492_8", 2116, FieldType.BIT, 8);
-	public static final Field UNUSEDBIT_492_9 = Field.create("UNUSEDBIT_492_9", 2116, FieldType.BIT, 9);
-	public static final Field UNUSEDBIT_492_10 = Field.create("UNUSEDBIT_492_10", 2116, FieldType.BIT, 10);
-	public static final Field UNUSEDBIT_492_11 = Field.create("UNUSEDBIT_492_11", 2116, FieldType.BIT, 11);
-	public static final Field UNUSEDBIT_492_12 = Field.create("UNUSEDBIT_492_12", 2116, FieldType.BIT, 12);
-	public static final Field UNUSEDBIT_492_13 = Field.create("UNUSEDBIT_492_13", 2116, FieldType.BIT, 13);
-	public static final Field UNUSEDBIT_492_14 = Field.create("UNUSEDBIT_492_14", 2116, FieldType.BIT, 14);
-	public static final Field UNUSEDBIT_492_15 = Field.create("UNUSEDBIT_492_15", 2116, FieldType.BIT, 15);
-	public static final Field UNUSEDBIT_492_16 = Field.create("UNUSEDBIT_492_16", 2116, FieldType.BIT, 16);
-	public static final Field UNUSEDBIT_492_17 = Field.create("UNUSEDBIT_492_17", 2116, FieldType.BIT, 17);
-	public static final Field UNUSEDBIT_492_18 = Field.create("UNUSEDBIT_492_18", 2116, FieldType.BIT, 18);
-	public static final Field UNUSEDBIT_492_19 = Field.create("UNUSEDBIT_492_19", 2116, FieldType.BIT, 19);
-	public static final Field UNUSEDBIT_492_20 = Field.create("UNUSEDBIT_492_20", 2116, FieldType.BIT, 20);
-	public static final Field UNUSEDBIT_492_21 = Field.create("UNUSEDBIT_492_21", 2116, FieldType.BIT, 21);
-	public static final Field UNUSEDBIT_492_22 = Field.create("UNUSEDBIT_492_22", 2116, FieldType.BIT, 22);
-	public static final Field UNUSEDBIT_492_23 = Field.create("UNUSEDBIT_492_23", 2116, FieldType.BIT, 23);
-	public static final Field UNUSEDBIT_492_24 = Field.create("UNUSEDBIT_492_24", 2116, FieldType.BIT, 24);
-	public static final Field UNUSEDBIT_492_25 = Field.create("UNUSEDBIT_492_25", 2116, FieldType.BIT, 25);
-	public static final Field UNUSEDBIT_492_26 = Field.create("UNUSEDBIT_492_26", 2116, FieldType.BIT, 26);
-	public static final Field UNUSEDBIT_492_27 = Field.create("UNUSEDBIT_492_27", 2116, FieldType.BIT, 27);
-	public static final Field UNUSEDBIT_492_28 = Field.create("UNUSEDBIT_492_28", 2116, FieldType.BIT, 28);
-	public static final Field UNUSEDBIT_492_29 = Field.create("UNUSEDBIT_492_29", 2116, FieldType.BIT, 29);
-	public static final Field UNUSEDBIT_492_30 = Field.create("UNUSEDBIT_492_30", 2116, FieldType.BIT, 30);
-	public static final Field UNUSEDBIT_492_31 = Field.create("UNUSEDBIT_492_31", 2116, FieldType.BIT, 31);
+	public static final Field UNUSEDBIT_493_8 = Field.create("UNUSEDBIT_493_8", 2116, FieldType.BIT, 8);
+	public static final Field UNUSEDBIT_493_9 = Field.create("UNUSEDBIT_493_9", 2116, FieldType.BIT, 9);
+	public static final Field UNUSEDBIT_493_10 = Field.create("UNUSEDBIT_493_10", 2116, FieldType.BIT, 10);
+	public static final Field UNUSEDBIT_493_11 = Field.create("UNUSEDBIT_493_11", 2116, FieldType.BIT, 11);
+	public static final Field UNUSEDBIT_493_12 = Field.create("UNUSEDBIT_493_12", 2116, FieldType.BIT, 12);
+	public static final Field UNUSEDBIT_493_13 = Field.create("UNUSEDBIT_493_13", 2116, FieldType.BIT, 13);
+	public static final Field UNUSEDBIT_493_14 = Field.create("UNUSEDBIT_493_14", 2116, FieldType.BIT, 14);
+	public static final Field UNUSEDBIT_493_15 = Field.create("UNUSEDBIT_493_15", 2116, FieldType.BIT, 15);
+	public static final Field UNUSEDBIT_493_16 = Field.create("UNUSEDBIT_493_16", 2116, FieldType.BIT, 16);
+	public static final Field UNUSEDBIT_493_17 = Field.create("UNUSEDBIT_493_17", 2116, FieldType.BIT, 17);
+	public static final Field UNUSEDBIT_493_18 = Field.create("UNUSEDBIT_493_18", 2116, FieldType.BIT, 18);
+	public static final Field UNUSEDBIT_493_19 = Field.create("UNUSEDBIT_493_19", 2116, FieldType.BIT, 19);
+	public static final Field UNUSEDBIT_493_20 = Field.create("UNUSEDBIT_493_20", 2116, FieldType.BIT, 20);
+	public static final Field UNUSEDBIT_493_21 = Field.create("UNUSEDBIT_493_21", 2116, FieldType.BIT, 21);
+	public static final Field UNUSEDBIT_493_22 = Field.create("UNUSEDBIT_493_22", 2116, FieldType.BIT, 22);
+	public static final Field UNUSEDBIT_493_23 = Field.create("UNUSEDBIT_493_23", 2116, FieldType.BIT, 23);
+	public static final Field UNUSEDBIT_493_24 = Field.create("UNUSEDBIT_493_24", 2116, FieldType.BIT, 24);
+	public static final Field UNUSEDBIT_493_25 = Field.create("UNUSEDBIT_493_25", 2116, FieldType.BIT, 25);
+	public static final Field UNUSEDBIT_493_26 = Field.create("UNUSEDBIT_493_26", 2116, FieldType.BIT, 26);
+	public static final Field UNUSEDBIT_493_27 = Field.create("UNUSEDBIT_493_27", 2116, FieldType.BIT, 27);
+	public static final Field UNUSEDBIT_493_28 = Field.create("UNUSEDBIT_493_28", 2116, FieldType.BIT, 28);
+	public static final Field UNUSEDBIT_493_29 = Field.create("UNUSEDBIT_493_29", 2116, FieldType.BIT, 29);
+	public static final Field UNUSEDBIT_493_30 = Field.create("UNUSEDBIT_493_30", 2116, FieldType.BIT, 30);
+	public static final Field UNUSEDBIT_493_31 = Field.create("UNUSEDBIT_493_31", 2116, FieldType.BIT, 31);
 	public static final Field CAN2NBCTYPE = Field.create("CAN2NBCTYPE", 2120, FieldType.INT);
 	public static final Field CAN2TXPIN = Field.create("CAN2TXPIN", 2124, FieldType.INT8, brain_pin_e);
 	public static final Field CAN2RXPIN = Field.create("CAN2RXPIN", 2125, FieldType.INT8, brain_pin_e);
@@ -2896,7 +2899,8 @@ public class Fields {
 	CRANKING_RPM,
 	PRIMINGSQUIRTDURATIONMS,
 	IGNITIONDWELLFORCRANKINGMS,
-	UNUSED104,
+	ETBREVLIMITSTART,
+	ETBREVLIMITRANGE,
 	MAP_SENSOR_LOWVALUE,
 	MAP_SENSOR_HIGHVALUE,
 	MAP_SENSOR_TYPE,
@@ -3321,8 +3325,8 @@ public class Fields {
 	KNOCKBANKCYL12,
 	TCUENABLED,
 	UNUSEDBIT_251_29,
-	UNUSEDBIT_289_30,
-	UNUSEDBIT_289_31,
+	UNUSEDBIT_290_30,
+	UNUSEDBIT_290_31,
 	ETBIO1_DIRECTIONPIN1,
 	ETBIO1_DIRECTIONPIN2,
 	ETBIO1_CONTROLPIN,
@@ -3600,30 +3604,30 @@ public class Fields {
 	UNUSED1128,
 	UNUSED1129,
 	UNUSED1130,
-	UNUSEDBIT_492_8,
-	UNUSEDBIT_492_9,
-	UNUSEDBIT_492_10,
-	UNUSEDBIT_492_11,
-	UNUSEDBIT_492_12,
-	UNUSEDBIT_492_13,
-	UNUSEDBIT_492_14,
-	UNUSEDBIT_492_15,
-	UNUSEDBIT_492_16,
-	UNUSEDBIT_492_17,
-	UNUSEDBIT_492_18,
-	UNUSEDBIT_492_19,
-	UNUSEDBIT_492_20,
-	UNUSEDBIT_492_21,
-	UNUSEDBIT_492_22,
-	UNUSEDBIT_492_23,
-	UNUSEDBIT_492_24,
-	UNUSEDBIT_492_25,
-	UNUSEDBIT_492_26,
-	UNUSEDBIT_492_27,
-	UNUSEDBIT_492_28,
-	UNUSEDBIT_492_29,
-	UNUSEDBIT_492_30,
-	UNUSEDBIT_492_31,
+	UNUSEDBIT_493_8,
+	UNUSEDBIT_493_9,
+	UNUSEDBIT_493_10,
+	UNUSEDBIT_493_11,
+	UNUSEDBIT_493_12,
+	UNUSEDBIT_493_13,
+	UNUSEDBIT_493_14,
+	UNUSEDBIT_493_15,
+	UNUSEDBIT_493_16,
+	UNUSEDBIT_493_17,
+	UNUSEDBIT_493_18,
+	UNUSEDBIT_493_19,
+	UNUSEDBIT_493_20,
+	UNUSEDBIT_493_21,
+	UNUSEDBIT_493_22,
+	UNUSEDBIT_493_23,
+	UNUSEDBIT_493_24,
+	UNUSEDBIT_493_25,
+	UNUSEDBIT_493_26,
+	UNUSEDBIT_493_27,
+	UNUSEDBIT_493_28,
+	UNUSEDBIT_493_29,
+	UNUSEDBIT_493_30,
+	UNUSEDBIT_493_31,
 	CAN2NBCTYPE,
 	CAN2TXPIN,
 	CAN2RXPIN,
diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml
index a4dc09e1b6..67b6fd934b 100644
--- a/java_console/rusefi.xml
+++ b/java_console/rusefi.xml
@@ -1,6 +1,6 @@
 <roms>
 
-<!-- was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh Tue Jun 15 21:31:44 UTC 2021 -->
+<!-- was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh Wed Jun 16 12:53:21 UTC 2021 -->
 
     <rom>
         <romid>