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 2aabd0c635..43cea65ce8 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 integration/rusefi_config.txt Fri Mar 20 19:55:09 EDT 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Mon Mar 23 22:06:01 EDT 2020
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@@ -339,10 +339,10 @@ struct trigger_config_s {
 	trigger_type_e type;
 	/**
 	offset 4 bit 0 */
-	bool unusedTriggerBit0 : 1;
+	bool todoRemoveMeOneDay0 : 1;
 	/**
 	offset 4 bit 1 */
-	bool unusedTriggerBit1 : 1;
+	bool todoRemoveMeOneDay1 : 1;
 	/**
 	 * This option could be used if your second trigger channel is broken
 	offset 4 bit 2 */
@@ -1445,15 +1445,17 @@ struct engine_configuration_s {
 	 */
 	int16_t stepperParkingExtraSteps;
 	/**
-	 * This magic property is specific to Mazda Miata NB2
 	 * offset 820
 	 */
-	float unusedmiataNb2VVTRatioFrom;
+	float antilagTimeout;
 	/**
-	 * This magic property is specific to Mazda Miata NB2
 	 * offset 824
 	 */
-	float unusedmiataNb2VVTRatioTo;
+	uint16_t antiLagRpmTreshold;
+	/**
+	 * offset 826
+	 */
+	uint16_t anotherUnused;
 	/**
 	 * This pin is used for debugging - snap a logic analyzer on it and see if it's ever high
 	 * offset 828
@@ -1603,13 +1605,13 @@ struct engine_configuration_s {
 	bool multisparkEnable : 1;
 	/**
 	offset 976 bit 4 */
-	bool unusedBit_251_4 : 1;
+	bool enableLaunchRetard : 1;
 	/**
 	offset 976 bit 5 */
-	bool unusedBit_251_5 : 1;
+	bool enableLaunchBoost : 1;
 	/**
 	offset 976 bit 6 */
-	bool unusedBit_251_6 : 1;
+	bool launchDisableBySpeed : 1;
 	/**
 	offset 976 bit 7 */
 	bool unusedBit_251_7 : 1;
@@ -1681,10 +1683,10 @@ struct engine_configuration_s {
 	bool unusedBit_251_29 : 1;
 	/**
 	offset 976 bit 30 */
-	bool unusedBit_280_30 : 1;
+	bool unusedBit_281_30 : 1;
 	/**
 	offset 976 bit 31 */
-	bool unusedBit_280_31 : 1;
+	bool unusedBit_281_31 : 1;
 	/**
 	 * offset 980
 	 */
@@ -1758,7 +1760,19 @@ struct engine_configuration_s {
 	/**
 	 * offset 1052
 	 */
-	int unusedAtOldBoardConfigurationEnd[103];
+	int launchAdvanceRpmRange;
+	/**
+	 * offset 1056
+	 */
+	int launchTpsTreshold;
+	/**
+	 * offset 1060
+	 */
+	float launchActivateDelay;
+	/**
+	 * offset 1064
+	 */
+	int unusedAtOldBoardConfigurationEnd[100];
 	/**
 	offset 1464 bit 0 */
 	bool vvtDisplayInverted : 1;
@@ -3242,4 +3256,4 @@ typedef struct persistent_config_s persistent_config_s;
 
 #endif
 // end
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Fri Mar 20 19:55:09 EDT 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Mon Mar 23 22:06:01 EDT 2020
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 098f789c1b..e245f9a976 100644
--- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
+++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
@@ -89,6 +89,8 @@
 #define ambiguousOperationMode_offset_hex 1e8
 #define analogInputDividerCoefficient_offset 460
 #define analogInputDividerCoefficient_offset_hex 1cc
+#define anotherUnused_offset 826
+#define anotherUnused_offset_hex 33a
 #define antiLagActivatePin_offset 990
 #define antiLagActivatePin_offset_hex 3de
 #define antiLagActivationMode_e_enum "Always Active", "Switch Input"
@@ -96,6 +98,10 @@
 #define antiLagActivationMode_offset_hex 400
 #define antiLagEnabled_offset 76
 #define antiLagEnabled_offset_hex 4c
+#define antiLagRpmTreshold_offset 824
+#define antiLagRpmTreshold_offset_hex 338
+#define antilagTimeout_offset 820
+#define antilagTimeout_offset_hex 334
 #define autoTuneCltThreshold_offset 2420
 #define autoTuneCltThreshold_offset_hex 974
 #define autoTuneTpsQuietPeriod_offset 2428
@@ -535,6 +541,10 @@
 #define enableAemXSeries_offset_hex 2e8
 #define enabledStep1Limiter_offset 744
 #define enabledStep1Limiter_offset_hex 2e8
+#define enableLaunchBoost_offset 976
+#define enableLaunchBoost_offset_hex 3d0
+#define enableLaunchRetard_offset 976
+#define enableLaunchRetard_offset_hex 3d0
 #define enableVerboseCanTx_offset 744
 #define enableVerboseCanTx_offset_hex 2e8
 #define engine_load_mode_e_enum "MAF", "Alpha-N/TPS", "MAP", "SPEED DENSITY", "MAF Air Charge"
@@ -1415,15 +1425,21 @@
 #define knockNoiseRpmBins_offset_hex 73c
 #define knockVThreshold_offset 1512
 #define knockVThreshold_offset_hex 5e8
+#define launchActivateDelay_offset 1060
+#define launchActivateDelay_offset_hex 424
 #define launchActivatePin_offset 991
 #define launchActivatePin_offset_hex 3df
 #define launchActivationMode_e_enum "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)","INVALID"
 #define launchActivationMode_offset 1020
 #define launchActivationMode_offset_hex 3fc
+#define launchAdvanceRpmRange_offset 1052
+#define launchAdvanceRpmRange_offset_hex 41c
 #define launchBoostDuty_offset 1044
 #define launchBoostDuty_offset_hex 414
 #define launchControlEnabled_offset 76
 #define launchControlEnabled_offset_hex 4c
+#define launchDisableBySpeed_offset 976
+#define launchDisableBySpeed_offset_hex 3d0
 #define launchFuelAdded_offset 1040
 #define launchFuelAdded_offset_hex 410
 #define launchFuelCutEnable_offset 1464
@@ -1442,6 +1458,8 @@
 #define launchTimingRetard_offset_hex 140
 #define launchTimingRpmRange_offset 1036
 #define launchTimingRpmRange_offset_hex 40c
+#define launchTpsTreshold_offset 1056
+#define launchTpsTreshold_offset_hex 420
 #define lcdThreadPeriodMs_offset 720
 #define lcdThreadPeriodMs_offset_hex 2d0
 #define LDS_ALTERNATOR_PID_STATE_INDEX 9
@@ -1941,6 +1959,10 @@
 #define trigger_offset 524
 #define trigger_offset_hex 20c
 #define TRIGGER_SIMULATOR_PIN_COUNT 3
+#define trigger_todoRemoveMeOneDay0_offset 528
+#define trigger_todoRemoveMeOneDay0_offset_hex 210
+#define trigger_todoRemoveMeOneDay1_offset 528
+#define trigger_todoRemoveMeOneDay1_offset_hex 210
 #define trigger_type_e_enum "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "trg44", "trg45", "INVALID"
 #define trigger_type_offset 524
 #define trigger_type_offset_hex 20c
@@ -2002,10 +2024,6 @@
 #define trigger_unusedBit_4_8_offset_hex 210
 #define trigger_unusedBit_4_9_offset 528
 #define trigger_unusedBit_4_9_offset_hex 210
-#define trigger_unusedTriggerBit0_offset 528
-#define trigger_unusedTriggerBit0_offset_hex 210
-#define trigger_unusedTriggerBit1_offset 528
-#define trigger_unusedTriggerBit1_offset_hex 210
 #define trigger_useOnlyFirstChannel_offset 528
 #define trigger_useOnlyFirstChannel_offset_hex 210
 #define triggerCompCenterVolt_offset 4036
@@ -2086,8 +2104,8 @@
 #define unused_1484_bit_31_offset_hex 5c4
 #define unused_former_warmup_target_afr_offset 2096
 #define unused_former_warmup_target_afr_offset_hex 830
-#define unusedAtOldBoardConfigurationEnd_offset 1052
-#define unusedAtOldBoardConfigurationEnd_offset_hex 41c
+#define unusedAtOldBoardConfigurationEnd_offset 1064
+#define unusedAtOldBoardConfigurationEnd_offset_hex 428
 #define unusedBit4_1476_offset 1476
 #define unusedBit4_1476_offset_hex 5c4
 #define unusedBit_251_10_offset 976
@@ -2130,22 +2148,16 @@
 #define unusedBit_251_28_offset_hex 3d0
 #define unusedBit_251_29_offset 976
 #define unusedBit_251_29_offset_hex 3d0
-#define unusedBit_251_4_offset 976
-#define unusedBit_251_4_offset_hex 3d0
-#define unusedBit_251_5_offset 976
-#define unusedBit_251_5_offset_hex 3d0
-#define unusedBit_251_6_offset 976
-#define unusedBit_251_6_offset_hex 3d0
 #define unusedBit_251_7_offset 976
 #define unusedBit_251_7_offset_hex 3d0
 #define unusedBit_251_8_offset 976
 #define unusedBit_251_8_offset_hex 3d0
 #define unusedBit_251_9_offset 976
 #define unusedBit_251_9_offset_hex 3d0
-#define unusedBit_280_30_offset 976
-#define unusedBit_280_30_offset_hex 3d0
-#define unusedBit_280_31_offset 976
-#define unusedBit_280_31_offset_hex 3d0
+#define unusedBit_281_30_offset 976
+#define unusedBit_281_30_offset_hex 3d0
+#define unusedBit_281_31_offset 976
+#define unusedBit_281_31_offset_hex 3d0
 #define unusedBit_34_31_offset 76
 #define unusedBit_34_31_offset_hex 4c
 #define unusedErrorPin_offset 2040
@@ -2154,10 +2166,6 @@
 #define unusedFlexFuelSensor_offset_hex c1c
 #define unusedFormerWarmupAfrPid_offset 1774
 #define unusedFormerWarmupAfrPid_offset_hex 6ee
-#define unusedmiataNb2VVTRatioFrom_offset 820
-#define unusedmiataNb2VVTRatioFrom_offset_hex 334
-#define unusedmiataNb2VVTRatioTo_offset 824
-#define unusedmiataNb2VVTRatioTo_offset_hex 338
 #define unusedSpiPadding4_offset 2593
 #define unusedSpiPadding4_offset_hex a21
 #define unusedSpiPadding5_offset 2713
diff --git a/firmware/controllers/algo/algo.mk b/firmware/controllers/algo/algo.mk
index d55e64de0a..ae6b29e0a4 100644
--- a/firmware/controllers/algo/algo.mk
+++ b/firmware/controllers/algo/algo.mk
@@ -5,6 +5,7 @@ CONTROLLERS_ALGO_SRC_CPP = $(PROJECT_DIR)/controllers/algo/advance_map.cpp \
 	$(GENERATED_ENUMS_DIR)/auto_generated_enums.cpp \
 	$(PROJECT_DIR)/controllers/algo/fuel_math.cpp \
 	$(PROJECT_DIR)/controllers/algo/accel_enrichment.cpp \
+	$(PROJECT_DIR)/controllers/algo/launch_control.cpp \
 	$(PROJECT_DIR)/controllers/algo/engine_configuration.cpp \
 	$(PROJECT_DIR)/controllers/algo/engine.cpp \
 	$(PROJECT_DIR)/controllers/algo/engine2.cpp \
diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h
index 6076943b55..45cffce289 100644
--- a/firmware/controllers/algo/engine.h
+++ b/firmware/controllers/algo/engine.h
@@ -79,6 +79,16 @@ public:
 	bool needTdcCallback = true;
 #endif /* EFI_UNIT_TEST */
 
+
+#if EFI_LAUNCH_CONTROL
+	bool launchActivatePinState = false;
+	bool isLaunchCondition = false;
+	bool applyLaunchExtraFuel = false;
+	bool setLaunchBoostDuty = false;
+	bool applyLaunchControlRetard = false;
+	bool rpmHardCut = false;
+#endif /* EFI_LAUNCH_CONTROL */
+
 	/**
 	 * if 2nd TPS is not configured we do not run 2nd ETB
 	 */
diff --git a/firmware/controllers/algo/launch_control.cpp b/firmware/controllers/algo/launch_control.cpp
new file mode 100644
index 0000000000..4528c8cbef
--- /dev/null
+++ b/firmware/controllers/algo/launch_control.cpp
@@ -0,0 +1,161 @@
+/*
+ * @file launch_control.cpp
+ *
+ *  @date 10. sep. 2019
+ *      Author: Ola Ruud
+ */
+
+#include "engine.h"
+
+#if EFI_LAUNCH_CONTROL
+#include "boost_control.h"
+#include "vehicle_speed.h"
+#include "launch_control.h"
+#include "io_pins.h"
+#include "engine_configuration.h"
+#include "engine_controller.h"
+#include "periodic_task.h"
+#include "pin_repository.h"
+#include "allsensors.h"
+#include "engine_math.h"
+#include "efi_gpio.h"
+#include "advance_map.h"
+#include "engine_state.h"
+#include "advance_map.h"
+
+static Logging *logger;
+
+#if EFI_TUNER_STUDIO
+#include "tunerstudio_configuration.h"
+extern TunerStudioOutputChannels tsOutputChannels;
+#endif /* EFI_TUNER_STUDIO */
+
+EXTERN_ENGINE
+;
+
+static bool getActivateSwitchCondition(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
+	switch (engineConfiguration->launchActivationMode) {
+	case SWITCH_INPUT_LAUNCH:
+		if (CONFIG(launchActivatePin) != GPIO_UNASSIGNED) {
+			engine->launchActivatePinState = efiReadPin(CONFIG(launchActivatePin));
+		}
+		return engine->launchActivatePinState;
+
+	case CLUTCH_INPUT_LAUNCH:
+		if (CONFIG(clutchDownPin) != GPIO_UNASSIGNED) {
+			engine->clutchDownState = efiReadPin(CONFIG(clutchDownPin));
+		}
+		return engine->clutchDownState;
+	default:
+		// ALWAYS_ACTIVE_LAUNCH
+		return true;
+	}
+}
+
+class LaunchControl: public PeriodicTimerController {
+	efitick_t launchTimer;
+
+	DECLARE_ENGINE_PTR;
+
+	int getPeriodMs() override {
+		return 50;
+	}
+
+	void PeriodicTask() override {
+		if (!CONFIG(launchControlEnabled)) {
+			return;
+		}
+
+		int rpm = GET_RPM_VALUE;
+		int speed = getVehicleSpeed();
+		int tps = getTPS(PASS_ENGINE_PARAMETER_SIGNATURE);
+		int tpstreshold = engineConfiguration->launchTpsTreshold;
+		float timeDelay = engineConfiguration->launchActivateDelay;
+		int cutRpmRange = engineConfiguration->hardCutRpmRange;
+		int launchAdvanceRpmRange = engineConfiguration->launchTimingRpmRange;
+		int launchRpm = engineConfiguration->launchRpm;
+
+		bool activateSwitchCondition = getActivateSwitchCondition(PASS_ENGINE_PARAMETER_SIGNATURE);
+
+		bool rpmCondition = (launchRpm < rpm);
+		bool tpsCondition = (tpstreshold < tps);
+
+		bool speedCondition = (CONFIG(launchSpeedTreshold) > speed) || !engineConfiguration->launchDisableBySpeed;
+
+		bool combinedConditions = speedCondition && activateSwitchCondition && rpmCondition && tpsCondition;
+
+		if (!combinedConditions) {
+			// conditions not met, reset timer
+			launchTimer = getTimeNowNt();
+			engine->isLaunchCondition = false;
+			engine->setLaunchBoostDuty = false;
+			engine->applyLaunchControlRetard = false;
+			engine->applyLaunchExtraFuel = false;
+		} else {
+			// If conditions are met...
+			if ((getTimeNowNt() - launchTimer > MS2NT(timeDelay * 1000)) && combinedConditions) {
+				engine->isLaunchCondition = true;           // ...enable launch!
+				engine->applyLaunchExtraFuel = true;
+			}
+			if (engineConfiguration->enableLaunchBoost) {
+				engine->setLaunchBoostDuty = true;           // ...enable boost!
+			}
+			if (engineConfiguration->enableLaunchRetard) {
+				engine->applyLaunchControlRetard = true;    // ...enable retard!
+			}
+		}
+		if (engineConfiguration->debugMode == DBG_LAUNCH) {
+#if EFI_TUNER_STUDIO
+			tsOutputChannels.debugIntField1 = rpmCondition;
+			tsOutputChannels.debugIntField2 = tpsCondition;
+			tsOutputChannels.debugIntField3 = speedCondition;
+			tsOutputChannels.debugIntField4 = activateSwitchCondition;
+			tsOutputChannels.debugIntField5 = engine->clutchDownState;
+			tsOutputChannels.debugFloatField1 = engine->launchActivatePinState;
+			tsOutputChannels.debugFloatField2 = engine->isLaunchCondition;
+			tsOutputChannels.debugFloatField3 = combinedConditions;
+#endif /* EFI_TUNER_STUDIO */
+		}
+	}
+};
+
+static LaunchControl Launch;
+
+void setDefaultLaunchParameters(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
+	engineConfiguration->launchRpm = 4000;    // Rpm to trigger Launch condition
+	engineConfiguration->launchTimingRetard = 10; // retard in absolute degrees ATDC
+	engineConfiguration->launchTimingRpmRange = 500; // Rpm above Launch triggered for full retard
+	engineConfiguration->launchSparkCutEnable = true;
+	engineConfiguration->launchFuelCutEnable = false;
+	engineConfiguration->hardCutRpmRange = 500; //Rpm above Launch triggered +(if retard enabled) launchTimingRpmRange to hard cut
+	engineConfiguration->launchSpeedTreshold = 10; //maximum speed allowed before disable launch
+	engineConfiguration->launchFuelAdded = 10; // Extra fuel in % when launch are triggered
+	engineConfiguration->launchBoostDuty = 70; // boost valve duty cycle at launch
+	engineConfiguration->launchActivateDelay = 3; // Delay in seconds for launch to kick in
+	engineConfiguration->enableLaunchRetard = true;
+	engineConfiguration->enableLaunchBoost = true;
+	engineConfiguration->launchSmoothRetard = true; //interpolates the advance linear from launchrpm to fully retarded at launchtimingrpmrange
+	engineConfiguration->antilagTimeout = 3;
+	engineConfiguration->antiLagRpmTreshold = 3000;
+}
+
+void applyLaunchControlLimiting(bool *limitedSpark, bool *limitedFuel DECLARE_ENGINE_PARAMETER_SUFFIX) {
+	int rpm = GET_RPM_VALUE;
+
+	int retardThresholdRpm = CONFIG(launchRpm) +
+		(CONFIG(enableLaunchRetard) ? CONFIG(launchAdvanceRpmRange) : 0) +
+		CONFIG(hardCutRpmRange);
+
+	if (retardThresholdRpm > GET_RPM_VALUE) {
+		*limitedSpark = engine->isLaunchCondition && engineConfiguration->launchSparkCutEnable;
+		*limitedFuel = engine->isLaunchCondition && engineConfiguration->launchFuelCutEnable;
+		engine->rpmHardCut = true;
+	}
+}
+
+void initLaunchControl(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
+	logger = sharedLogger;
+	Launch.Start();
+}
+
+#endif /* EFI_LAUNCH_CONTROL */
diff --git a/firmware/controllers/algo/launch_control.h b/firmware/controllers/algo/launch_control.h
index 4b44f16ac4..71d48bf8fa 100644
--- a/firmware/controllers/algo/launch_control.h
+++ b/firmware/controllers/algo/launch_control.h
@@ -10,3 +10,4 @@
 #include "engine.h"
 
 void initLaunchControl(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX);
+void setDefaultLaunchParameters(DECLARE_CONFIG_PARAMETER_SIGNATURE);
diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h
index 1c324af2d0..7cf3e4a9b4 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 integration\rusefi_config.txt Fri Mar 20 19:54:54 EDT 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Mon Mar 23 22:05:45 EDT 2020
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@@ -339,10 +339,10 @@ struct trigger_config_s {
 	trigger_type_e type;
 	/**
 	offset 4 bit 0 */
-	bool unusedTriggerBit0 : 1;
+	bool todoRemoveMeOneDay0 : 1;
 	/**
 	offset 4 bit 1 */
-	bool unusedTriggerBit1 : 1;
+	bool todoRemoveMeOneDay1 : 1;
 	/**
 	 * This option could be used if your second trigger channel is broken
 	offset 4 bit 2 */
@@ -1445,15 +1445,17 @@ struct engine_configuration_s {
 	 */
 	int16_t stepperParkingExtraSteps;
 	/**
-	 * This magic property is specific to Mazda Miata NB2
 	 * offset 820
 	 */
-	float unusedmiataNb2VVTRatioFrom;
+	float antilagTimeout;
 	/**
-	 * This magic property is specific to Mazda Miata NB2
 	 * offset 824
 	 */
-	float unusedmiataNb2VVTRatioTo;
+	uint16_t antiLagRpmTreshold;
+	/**
+	 * offset 826
+	 */
+	uint16_t anotherUnused;
 	/**
 	 * This pin is used for debugging - snap a logic analyzer on it and see if it's ever high
 	 * offset 828
@@ -1603,13 +1605,13 @@ struct engine_configuration_s {
 	bool multisparkEnable : 1;
 	/**
 	offset 976 bit 4 */
-	bool unusedBit_251_4 : 1;
+	bool enableLaunchRetard : 1;
 	/**
 	offset 976 bit 5 */
-	bool unusedBit_251_5 : 1;
+	bool enableLaunchBoost : 1;
 	/**
 	offset 976 bit 6 */
-	bool unusedBit_251_6 : 1;
+	bool launchDisableBySpeed : 1;
 	/**
 	offset 976 bit 7 */
 	bool unusedBit_251_7 : 1;
@@ -1681,10 +1683,10 @@ struct engine_configuration_s {
 	bool unusedBit_251_29 : 1;
 	/**
 	offset 976 bit 30 */
-	bool unusedBit_280_30 : 1;
+	bool unusedBit_281_30 : 1;
 	/**
 	offset 976 bit 31 */
-	bool unusedBit_280_31 : 1;
+	bool unusedBit_281_31 : 1;
 	/**
 	 * offset 980
 	 */
@@ -1758,7 +1760,19 @@ struct engine_configuration_s {
 	/**
 	 * offset 1052
 	 */
-	int unusedAtOldBoardConfigurationEnd[103];
+	int launchAdvanceRpmRange;
+	/**
+	 * offset 1056
+	 */
+	int launchTpsTreshold;
+	/**
+	 * offset 1060
+	 */
+	float launchActivateDelay;
+	/**
+	 * offset 1064
+	 */
+	int unusedAtOldBoardConfigurationEnd[100];
 	/**
 	offset 1464 bit 0 */
 	bool vvtDisplayInverted : 1;
@@ -3242,4 +3256,4 @@ typedef struct persistent_config_s persistent_config_s;
 
 #endif
 // end
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Mar 20 19:54:54 EDT 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Mon Mar 23 22:05:45 EDT 2020
diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h
index f9dd1048e1..298dedc4a5 100644
--- a/firmware/controllers/generated/rusefi_generated.h
+++ b/firmware/controllers/generated/rusefi_generated.h
@@ -89,6 +89,8 @@
 #define ambiguousOperationMode_offset_hex 1e8
 #define analogInputDividerCoefficient_offset 460
 #define analogInputDividerCoefficient_offset_hex 1cc
+#define anotherUnused_offset 826
+#define anotherUnused_offset_hex 33a
 #define antiLagActivatePin_offset 990
 #define antiLagActivatePin_offset_hex 3de
 #define antiLagActivationMode_e_enum "Always Active", "Switch Input"
@@ -96,6 +98,10 @@
 #define antiLagActivationMode_offset_hex 400
 #define antiLagEnabled_offset 76
 #define antiLagEnabled_offset_hex 4c
+#define antiLagRpmTreshold_offset 824
+#define antiLagRpmTreshold_offset_hex 338
+#define antilagTimeout_offset 820
+#define antilagTimeout_offset_hex 334
 #define autoTuneCltThreshold_offset 2420
 #define autoTuneCltThreshold_offset_hex 974
 #define autoTuneTpsQuietPeriod_offset 2428
@@ -535,6 +541,10 @@
 #define enableAemXSeries_offset_hex 2e8
 #define enabledStep1Limiter_offset 744
 #define enabledStep1Limiter_offset_hex 2e8
+#define enableLaunchBoost_offset 976
+#define enableLaunchBoost_offset_hex 3d0
+#define enableLaunchRetard_offset 976
+#define enableLaunchRetard_offset_hex 3d0
 #define enableVerboseCanTx_offset 744
 #define enableVerboseCanTx_offset_hex 2e8
 #define engine_load_mode_e_enum "MAF", "Alpha-N/TPS", "MAP", "SPEED DENSITY", "MAF Air Charge"
@@ -1415,15 +1425,21 @@
 #define knockNoiseRpmBins_offset_hex 73c
 #define knockVThreshold_offset 1512
 #define knockVThreshold_offset_hex 5e8
+#define launchActivateDelay_offset 1060
+#define launchActivateDelay_offset_hex 424
 #define launchActivatePin_offset 991
 #define launchActivatePin_offset_hex 3df
 #define launchActivationMode_e_enum "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)","INVALID"
 #define launchActivationMode_offset 1020
 #define launchActivationMode_offset_hex 3fc
+#define launchAdvanceRpmRange_offset 1052
+#define launchAdvanceRpmRange_offset_hex 41c
 #define launchBoostDuty_offset 1044
 #define launchBoostDuty_offset_hex 414
 #define launchControlEnabled_offset 76
 #define launchControlEnabled_offset_hex 4c
+#define launchDisableBySpeed_offset 976
+#define launchDisableBySpeed_offset_hex 3d0
 #define launchFuelAdded_offset 1040
 #define launchFuelAdded_offset_hex 410
 #define launchFuelCutEnable_offset 1464
@@ -1442,6 +1458,8 @@
 #define launchTimingRetard_offset_hex 140
 #define launchTimingRpmRange_offset 1036
 #define launchTimingRpmRange_offset_hex 40c
+#define launchTpsTreshold_offset 1056
+#define launchTpsTreshold_offset_hex 420
 #define lcdThreadPeriodMs_offset 720
 #define lcdThreadPeriodMs_offset_hex 2d0
 #define LDS_ALTERNATOR_PID_STATE_INDEX 9
@@ -1941,6 +1959,10 @@
 #define trigger_offset 524
 #define trigger_offset_hex 20c
 #define TRIGGER_SIMULATOR_PIN_COUNT 3
+#define trigger_todoRemoveMeOneDay0_offset 528
+#define trigger_todoRemoveMeOneDay0_offset_hex 210
+#define trigger_todoRemoveMeOneDay1_offset 528
+#define trigger_todoRemoveMeOneDay1_offset_hex 210
 #define trigger_type_e_enum "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "trg44", "trg45", "INVALID"
 #define trigger_type_offset 524
 #define trigger_type_offset_hex 20c
@@ -2002,10 +2024,6 @@
 #define trigger_unusedBit_4_8_offset_hex 210
 #define trigger_unusedBit_4_9_offset 528
 #define trigger_unusedBit_4_9_offset_hex 210
-#define trigger_unusedTriggerBit0_offset 528
-#define trigger_unusedTriggerBit0_offset_hex 210
-#define trigger_unusedTriggerBit1_offset 528
-#define trigger_unusedTriggerBit1_offset_hex 210
 #define trigger_useOnlyFirstChannel_offset 528
 #define trigger_useOnlyFirstChannel_offset_hex 210
 #define triggerCompCenterVolt_offset 4036
@@ -2086,8 +2104,8 @@
 #define unused_1484_bit_31_offset_hex 5c4
 #define unused_former_warmup_target_afr_offset 2096
 #define unused_former_warmup_target_afr_offset_hex 830
-#define unusedAtOldBoardConfigurationEnd_offset 1052
-#define unusedAtOldBoardConfigurationEnd_offset_hex 41c
+#define unusedAtOldBoardConfigurationEnd_offset 1064
+#define unusedAtOldBoardConfigurationEnd_offset_hex 428
 #define unusedBit4_1476_offset 1476
 #define unusedBit4_1476_offset_hex 5c4
 #define unusedBit_251_10_offset 976
@@ -2130,22 +2148,16 @@
 #define unusedBit_251_28_offset_hex 3d0
 #define unusedBit_251_29_offset 976
 #define unusedBit_251_29_offset_hex 3d0
-#define unusedBit_251_4_offset 976
-#define unusedBit_251_4_offset_hex 3d0
-#define unusedBit_251_5_offset 976
-#define unusedBit_251_5_offset_hex 3d0
-#define unusedBit_251_6_offset 976
-#define unusedBit_251_6_offset_hex 3d0
 #define unusedBit_251_7_offset 976
 #define unusedBit_251_7_offset_hex 3d0
 #define unusedBit_251_8_offset 976
 #define unusedBit_251_8_offset_hex 3d0
 #define unusedBit_251_9_offset 976
 #define unusedBit_251_9_offset_hex 3d0
-#define unusedBit_280_30_offset 976
-#define unusedBit_280_30_offset_hex 3d0
-#define unusedBit_280_31_offset 976
-#define unusedBit_280_31_offset_hex 3d0
+#define unusedBit_281_30_offset 976
+#define unusedBit_281_30_offset_hex 3d0
+#define unusedBit_281_31_offset 976
+#define unusedBit_281_31_offset_hex 3d0
 #define unusedBit_34_31_offset 76
 #define unusedBit_34_31_offset_hex 4c
 #define unusedErrorPin_offset 2040
@@ -2154,10 +2166,6 @@
 #define unusedFlexFuelSensor_offset_hex c1c
 #define unusedFormerWarmupAfrPid_offset 1774
 #define unusedFormerWarmupAfrPid_offset_hex 6ee
-#define unusedmiataNb2VVTRatioFrom_offset 820
-#define unusedmiataNb2VVTRatioFrom_offset_hex 334
-#define unusedmiataNb2VVTRatioTo_offset 824
-#define unusedmiataNb2VVTRatioTo_offset_hex 338
 #define unusedSpiPadding4_offset 2593
 #define unusedSpiPadding4_offset_hex a21
 #define unusedSpiPadding5_offset 2713
diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index 43107543b9..63a814d9de 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -475,8 +475,8 @@ custom bool32_t 4 bits,    U32,   @OFFSET@, [0:0], "false", "true"
 custom trigger_type_e 4 bits,    U32,   @OFFSET@, [0:7], @@trigger_type_e_enum@@
 	trigger_type_e type;set trigger_type X
 
-	bit unusedTriggerBit0;
-	bit unusedTriggerBit1;
+	bit todoRemoveMeOneDay0;
+	bit todoRemoveMeOneDay1;
 	bit useOnlyFirstChannel;+This option could be used if your second trigger channel is broken
 
 	int customTotalToothCount;;"number",    1,      0.0,       0,  500.0,        0
@@ -693,8 +693,11 @@ custom uart_device_e 1 bits,U32,   @OFFSET@, [0:7], "Off", "UART1", "UART2", "UA
 	int mapMinBufferLength;;"count",        1,     0,  0,    24,  0
 	int16_t idlePidDeactivationTpsThreshold;;"%",        1,     0,  0,    100.0,  0
 	int16_t stepperParkingExtraSteps;;"%",        1,     0,  0,    3000.0,  0
-	float unusedmiataNb2VVTRatioFrom;This magic property is specific to Mazda Miata NB2;"value",      1,      0,       0, 1000,      5
-	float unusedmiataNb2VVTRatioTo;This magic property is specific to Mazda Miata NB2;"value",      1,      0,       0, 1000,      5
+	float antilagTimeout
+	uint16_t antiLagRpmTreshold
+	uint16_t anotherUnused
+	
+	
 
 	brain_pin_e triggerErrorPin;+This pin is used for debugging - snap a logic analyzer on it and see if it's ever high
 	pin_output_mode_e triggerErrorPinMode;
@@ -758,9 +761,9 @@ custom maf_sensor_type_e 4 bits, S32, @OFFSET@, [0:7], @@maf_sensor_type_e_enum@
 	bit todoClutchDownPinInverted
 	bit useHbridges
 	bit multisparkEnable
-	bit unusedBit_251_4
-	bit unusedBit_251_5
-	bit unusedBit_251_6
+	bit enableLaunchRetard
+	bit enableLaunchBoost
+	bit launchDisableBySpeed
 	bit unusedBit_251_7
 	bit unusedBit_251_8
 	bit unusedBit_251_9
@@ -812,8 +815,11 @@ custom maf_sensor_type_e 4 bits, S32, @OFFSET@, [0:7], @@maf_sensor_type_e_enum@
     int launchFuelAdded;+Extra Fuel Added;"%",        1,     0,  0,    100.0,  0
     int launchBoostDuty;+Duty Cycle for the Boost Solenoid;"%",        1,     0,  0,    100.0,  0
 	int hardCutRpmRange;+RPM Range for Hard Cut;"rpm",    1,      0,       0, 3000.0,        2
+	int launchAdvanceRpmRange;
+	int launchTpsTreshold;
+	float launchActivateDelay;
 
-	int[103] unusedAtOldBoardConfigurationEnd;
+	int[100] unusedAtOldBoardConfigurationEnd;
 
 	bit vvtDisplayInverted
 	bit fuelClosedLoopCorrectionEnabled;+Enables lambda sensor closed loop feedback for fuelling.
diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini
index 3cf6864fb0..ee629e2f96 100644
--- a/firmware/tunerstudio/rusefi.ini
+++ b/firmware/tunerstudio/rusefi.ini
@@ -85,7 +85,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 integration\rusefi_config.txt Sun Mar 22 20:14:01 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Mon Mar 23 23:17:14 EDT 2020
 
 pageSize            = 20000
 page = 1
@@ -205,8 +205,8 @@ page = 1
 ;no TS info - skipping overrideCrankingIgnition offset 516
 	sensorChartFrequency			= scalar, S32,	520,	"index", 1, 0, 0, 300, 0 ; size 4
 	trigger_type				 = bits, U32, 524, [0:7], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "trg44", "trg45", "INVALID"
-	trigger_unusedTriggerBit0= bits,    U32,   	528, [0:0], "false", "true"
-	trigger_unusedTriggerBit1= bits,    U32,   	528, [1:1], "false", "true"
+	trigger_todoRemoveMeOneDay0= bits,    U32,   	528, [0:0], "false", "true"
+	trigger_todoRemoveMeOneDay1= bits,    U32,   	528, [1:1], "false", "true"
 	trigger_useOnlyFirstChannel= bits,    U32,   	528, [2:2], "false", "true"
 	trigger_unusedBit_4_3	= bits,    U32,   	528, [3:3], "false", "true"
 	trigger_unusedBit_4_4	= bits,    U32,   	528, [4:4], "false", "true"
@@ -456,8 +456,9 @@ page = 1
 	mapMinBufferLength				= scalar, S32,	812,	"count", 1, 0, 0, 24, 0
 	idlePidDeactivationTpsThreshold		= scalar, S16,	816,	"%", 1, 0, 0, 100.0, 0
 	stepperParkingExtraSteps		= scalar, S16,	818,	"%", 1, 0, 0, 3000.0, 0
-	unusedmiataNb2VVTRatioFrom		= scalar, F32,	820,	"value", 1, 0, 0, 1000, 5
-	unusedmiataNb2VVTRatioTo		= scalar, F32,	824,	"value", 1, 0, 0, 1000, 5
+;no TS info - skipping antilagTimeout offset 820
+;no TS info - skipping antiLagRpmTreshold offset 824
+;no TS info - skipping anotherUnused offset 826
 	triggerErrorPin				 = bits, U08, 828, [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","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	triggerErrorPinMode			 = bits, U08, 829, [0:7], "default", "default inverted", "open collector", "open collector inverted"
 	acRelayPin					 = bits, U08, 830, [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","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", "MC33972_1", "MC33972_2", "MC33972_3", "MC33972_4", "MC33972_5", "MC33972_6", "MC33972_7", "MC33972_8", "MC33972_9", "MC33972_10", "MC33972_11", "MC33972_12", "MC33972_13", "MC33972_14", "MC33972_15", "MC33972_16", "MC33972_17", "MC33972_18", "MC33972_19", "MC33972_20", "MC33972_21", "MC33972_22", "TLE8888_1", "TLE8888_2", "TLE8888_3", "TLE8888_4", "TLE8888_5", "TLE8888_6", "TLE8888_7", "TLE8888_8", "TLE8888_9", "TLE8888_10", "TLE8888_11", "TLE8888_12", "TLE8888_13", "TLE8888_14", "TLE8888_15", "TLE8888_16", "TLE8888_17", "TLE8888_18", "TLE8888_19", "TLE8888_20", "TLE8888_21", "TLE8888_22", "TLE8888_23", "TLE8888_24", "TLE8888_25", "TLE8888_26", "TLE8888_27", "TLE8888_28", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -539,9 +540,9 @@ page = 1
 	todoClutchDownPinInverted= bits,    U32,   	976, [1:1], "false", "true"
 	useHbridges				= bits,    U32,   	976, [2:2], "false", "true"
 	multisparkEnable		= bits,    U32,   	976, [3:3], "false", "true"
-	unusedBit_251_4			= bits,    U32,   	976, [4:4], "false", "true"
-	unusedBit_251_5			= bits,    U32,   	976, [5:5], "false", "true"
-	unusedBit_251_6			= bits,    U32,   	976, [6:6], "false", "true"
+	enableLaunchRetard		= bits,    U32,   	976, [4:4], "false", "true"
+	enableLaunchBoost		= bits,    U32,   	976, [5:5], "false", "true"
+	launchDisableBySpeed	= bits,    U32,   	976, [6:6], "false", "true"
 	unusedBit_251_7			= bits,    U32,   	976, [7:7], "false", "true"
 	unusedBit_251_8			= bits,    U32,   	976, [8:8], "false", "true"
 	unusedBit_251_9			= bits,    U32,   	976, [9:9], "false", "true"
@@ -565,8 +566,8 @@ page = 1
 	unusedBit_251_27		= bits,    U32,   	976, [27:27], "false", "true"
 	unusedBit_251_28		= bits,    U32,   	976, [28:28], "false", "true"
 	unusedBit_251_29		= bits,    U32,   	976, [29:29], "false", "true"
-	unusedBit_280_30		= bits,    U32,   	976, [30:30], "false", "true"
-	unusedBit_280_31		= bits,    U32,   	976, [31:31], "false", "true"
+	unusedBit_281_30		= bits,    U32,   	976, [30:30], "false", "true"
+	unusedBit_281_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","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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_controlPin1			 = 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","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -596,7 +597,10 @@ page = 1
 	launchFuelAdded					= scalar, S32,	1040,	"%", 1, 0, 0, 100.0, 0
 	launchBoostDuty					= scalar, S32,	1044,	"%", 1, 0, 0, 100.0, 0
 	hardCutRpmRange					= scalar, S32,	1048,	"rpm", 1, 0, 0, 3000.0, 2
-;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1052
+;no TS info - skipping launchAdvanceRpmRange offset 1052
+;no TS info - skipping launchTpsTreshold offset 1056
+;no TS info - skipping launchActivateDelay offset 1060
+;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1064
 	vvtDisplayInverted		= bits,    U32,   	1464, [0:0], "false", "true"
 	fuelClosedLoopCorrectionEnabled= bits,    U32,   	1464, [1:1], "false", "true"
 	isVerboseIAC			= bits,    U32,   	1464, [2:2], "false", "true"
@@ -3629,7 +3633,7 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "aux valve #1", 						auxValves1
 		field = "aux valve #2", 						auxValves2
 		field = "Start/Stop Button",					startStopButtonPin
-		field = ""			
+		field = "External Knock",						externalKnockSenseAdc
 		
 	dialog = fsioFrequency, "Frequency"
 		field = "freq #1", 								fsioFrequency1
diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index a320f2dd9f..dec44a5e2d 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -2497,7 +2497,7 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "aux valve #1", 						auxValves1
 		field = "aux valve #2", 						auxValves2
 		field = "Start/Stop Button",					startStopButtonPin
-		field = ""			
+		field = "External Knock",						externalKnockSenseAdc
 		
 	dialog = fsioFrequency, "Frequency"
 		field = "freq #1", 								fsioFrequency1
diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini
index 3ce6c77915..31991dcd01 100644
--- a/firmware/tunerstudio/rusefi_frankenso.ini
+++ b/firmware/tunerstudio/rusefi_frankenso.ini
@@ -85,7 +85,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 integration\rusefi_config.txt Sun Mar 22 20:14:07 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Mon Mar 23 23:17:20 EDT 2020
 
 pageSize            = 20000
 page = 1
@@ -205,8 +205,8 @@ page = 1
 ;no TS info - skipping overrideCrankingIgnition offset 516
 	sensorChartFrequency			= scalar, S32,	520,	"index", 1, 0, 0, 300, 0 ; size 4
 	trigger_type				 = bits, U32, 524, [0:7], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "trg44", "trg45", "INVALID"
-	trigger_unusedTriggerBit0= bits,    U32,   	528, [0:0], "false", "true"
-	trigger_unusedTriggerBit1= bits,    U32,   	528, [1:1], "false", "true"
+	trigger_todoRemoveMeOneDay0= bits,    U32,   	528, [0:0], "false", "true"
+	trigger_todoRemoveMeOneDay1= bits,    U32,   	528, [1:1], "false", "true"
 	trigger_useOnlyFirstChannel= bits,    U32,   	528, [2:2], "false", "true"
 	trigger_unusedBit_4_3	= bits,    U32,   	528, [3:3], "false", "true"
 	trigger_unusedBit_4_4	= bits,    U32,   	528, [4:4], "false", "true"
@@ -456,8 +456,9 @@ page = 1
 	mapMinBufferLength				= scalar, S32,	812,	"count", 1, 0, 0, 24, 0
 	idlePidDeactivationTpsThreshold		= scalar, S16,	816,	"%", 1, 0, 0, 100.0, 0
 	stepperParkingExtraSteps		= scalar, S16,	818,	"%", 1, 0, 0, 3000.0, 0
-	unusedmiataNb2VVTRatioFrom		= scalar, F32,	820,	"value", 1, 0, 0, 1000, 5
-	unusedmiataNb2VVTRatioTo		= scalar, F32,	824,	"value", 1, 0, 0, 1000, 5
+;no TS info - skipping antilagTimeout offset 820
+;no TS info - skipping antiLagRpmTreshold offset 824
+;no TS info - skipping anotherUnused offset 826
 	triggerErrorPin				 = bits, U08, 828, [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","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	triggerErrorPinMode			 = bits, U08, 829, [0:7], "default", "default inverted", "open collector", "open collector inverted"
 	acRelayPin					 = bits, U08, 830, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Injector 3Z","Injector 3Y","Injector 3W","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Coil 1H","INVALID","Coil 1F","INVALID","INVALID","INVALID","Injector 2M","INVALID","INVALID","INVALID","INVALID","INVALID","Injector 3U","INVALID","Injector 3X","INVALID","Injector 2N","Coil 1O","Coil 1P","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Injector 3V","Injector 3S","Injector 3T","Injector 2O","Injector 2P","INVALID","Coil 1L","INVALID","Coil 1I","INVALID","Coil 1M","INVALID","Coil 1G","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
@@ -539,9 +540,9 @@ page = 1
 	todoClutchDownPinInverted= bits,    U32,   	976, [1:1], "false", "true"
 	useHbridges				= bits,    U32,   	976, [2:2], "false", "true"
 	multisparkEnable		= bits,    U32,   	976, [3:3], "false", "true"
-	unusedBit_251_4			= bits,    U32,   	976, [4:4], "false", "true"
-	unusedBit_251_5			= bits,    U32,   	976, [5:5], "false", "true"
-	unusedBit_251_6			= bits,    U32,   	976, [6:6], "false", "true"
+	enableLaunchRetard		= bits,    U32,   	976, [4:4], "false", "true"
+	enableLaunchBoost		= bits,    U32,   	976, [5:5], "false", "true"
+	launchDisableBySpeed	= bits,    U32,   	976, [6:6], "false", "true"
 	unusedBit_251_7			= bits,    U32,   	976, [7:7], "false", "true"
 	unusedBit_251_8			= bits,    U32,   	976, [8:8], "false", "true"
 	unusedBit_251_9			= bits,    U32,   	976, [9:9], "false", "true"
@@ -565,8 +566,8 @@ page = 1
 	unusedBit_251_27		= bits,    U32,   	976, [27:27], "false", "true"
 	unusedBit_251_28		= bits,    U32,   	976, [28:28], "false", "true"
 	unusedBit_251_29		= bits,    U32,   	976, [29:29], "false", "true"
-	unusedBit_280_30		= bits,    U32,   	976, [30:30], "false", "true"
-	unusedBit_280_31		= bits,    U32,   	976, [31:31], "false", "true"
+	unusedBit_281_30		= bits,    U32,   	976, [30:30], "false", "true"
+	unusedBit_281_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","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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_controlPin1			 = 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","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -596,7 +597,10 @@ page = 1
 	launchFuelAdded					= scalar, S32,	1040,	"%", 1, 0, 0, 100.0, 0
 	launchBoostDuty					= scalar, S32,	1044,	"%", 1, 0, 0, 100.0, 0
 	hardCutRpmRange					= scalar, S32,	1048,	"rpm", 1, 0, 0, 3000.0, 2
-;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1052
+;no TS info - skipping launchAdvanceRpmRange offset 1052
+;no TS info - skipping launchTpsTreshold offset 1056
+;no TS info - skipping launchActivateDelay offset 1060
+;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1064
 	vvtDisplayInverted		= bits,    U32,   	1464, [0:0], "false", "true"
 	fuelClosedLoopCorrectionEnabled= bits,    U32,   	1464, [1:1], "false", "true"
 	isVerboseIAC			= bits,    U32,   	1464, [2:2], "false", "true"
@@ -3629,7 +3633,7 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "aux valve #1", 						auxValves1
 		field = "aux valve #2", 						auxValves2
 		field = "Start/Stop Button",					startStopButtonPin
-		field = ""			
+		field = "External Knock",						externalKnockSenseAdc
 		
 	dialog = fsioFrequency, "Frequency"
 		field = "freq #1", 								fsioFrequency1
diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini
index 827e9b0471..5f096f8d55 100644
--- a/firmware/tunerstudio/rusefi_kinetis.ini
+++ b/firmware/tunerstudio/rusefi_kinetis.ini
@@ -85,7 +85,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 integration/rusefi_config.txt Sun Mar 22 20:14:17 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Mon Mar 23 22:06:01 EDT 2020
 
 pageSize            = 20000
 page = 1
@@ -205,8 +205,8 @@ page = 1
 ;no TS info - skipping overrideCrankingIgnition offset 516
 	sensorChartFrequency			= scalar, S32,	520,	"index", 1, 0, 0, 300, 0 ; size 4
 	trigger_type				 = bits, U32, 524, [0:7], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "trg44", "trg45", "INVALID"
-	trigger_unusedTriggerBit0= bits,    U32,   	528, [0:0], "false", "true"
-	trigger_unusedTriggerBit1= bits,    U32,   	528, [1:1], "false", "true"
+	trigger_todoRemoveMeOneDay0= bits,    U32,   	528, [0:0], "false", "true"
+	trigger_todoRemoveMeOneDay1= bits,    U32,   	528, [1:1], "false", "true"
 	trigger_useOnlyFirstChannel= bits,    U32,   	528, [2:2], "false", "true"
 	trigger_unusedBit_4_3	= bits,    U32,   	528, [3:3], "false", "true"
 	trigger_unusedBit_4_4	= bits,    U32,   	528, [4:4], "false", "true"
@@ -456,8 +456,9 @@ page = 1
 	mapMinBufferLength				= scalar, S32,	812,	"count", 1, 0, 0, 24, 0
 	idlePidDeactivationTpsThreshold		= scalar, S16,	816,	"%", 1, 0, 0, 100.0, 0
 	stepperParkingExtraSteps		= scalar, S16,	818,	"%", 1, 0, 0, 3000.0, 0
-	unusedmiataNb2VVTRatioFrom		= scalar, F32,	820,	"value", 1, 0, 0, 1000, 5
-	unusedmiataNb2VVTRatioTo		= scalar, F32,	824,	"value", 1, 0, 0, 1000, 5
+;no TS info - skipping antilagTimeout offset 820
+;no TS info - skipping antiLagRpmTreshold offset 824
+;no TS info - skipping anotherUnused offset 826
 	triggerErrorPin				 = bits, U08, 828, [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"
 	triggerErrorPinMode			 = bits, U08, 829, [0:7], "default", "default inverted", "open collector", "open collector inverted"
 	acRelayPin					 = bits, U08, 830, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "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"
@@ -539,9 +540,9 @@ page = 1
 	todoClutchDownPinInverted= bits,    U32,   	976, [1:1], "false", "true"
 	useHbridges				= bits,    U32,   	976, [2:2], "false", "true"
 	multisparkEnable		= bits,    U32,   	976, [3:3], "false", "true"
-	unusedBit_251_4			= bits,    U32,   	976, [4:4], "false", "true"
-	unusedBit_251_5			= bits,    U32,   	976, [5:5], "false", "true"
-	unusedBit_251_6			= bits,    U32,   	976, [6:6], "false", "true"
+	enableLaunchRetard		= bits,    U32,   	976, [4:4], "false", "true"
+	enableLaunchBoost		= bits,    U32,   	976, [5:5], "false", "true"
+	launchDisableBySpeed	= bits,    U32,   	976, [6:6], "false", "true"
 	unusedBit_251_7			= bits,    U32,   	976, [7:7], "false", "true"
 	unusedBit_251_8			= bits,    U32,   	976, [8:8], "false", "true"
 	unusedBit_251_9			= bits,    U32,   	976, [9:9], "false", "true"
@@ -565,8 +566,8 @@ page = 1
 	unusedBit_251_27		= bits,    U32,   	976, [27:27], "false", "true"
 	unusedBit_251_28		= bits,    U32,   	976, [28:28], "false", "true"
 	unusedBit_251_29		= bits,    U32,   	976, [29:29], "false", "true"
-	unusedBit_280_30		= bits,    U32,   	976, [30:30], "false", "true"
-	unusedBit_280_31		= bits,    U32,   	976, [31:31], "false", "true"
+	unusedBit_281_30		= bits,    U32,   	976, [30:30], "false", "true"
+	unusedBit_281_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"
 	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"
 	etbIo1_controlPin1			 = 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"
@@ -596,7 +597,10 @@ page = 1
 	launchFuelAdded					= scalar, S32,	1040,	"%", 1, 0, 0, 100.0, 0
 	launchBoostDuty					= scalar, S32,	1044,	"%", 1, 0, 0, 100.0, 0
 	hardCutRpmRange					= scalar, S32,	1048,	"rpm", 1, 0, 0, 3000.0, 2
-;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1052
+;no TS info - skipping launchAdvanceRpmRange offset 1052
+;no TS info - skipping launchTpsTreshold offset 1056
+;no TS info - skipping launchActivateDelay offset 1060
+;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1064
 	vvtDisplayInverted		= bits,    U32,   	1464, [0:0], "false", "true"
 	fuelClosedLoopCorrectionEnabled= bits,    U32,   	1464, [1:1], "false", "true"
 	isVerboseIAC			= bits,    U32,   	1464, [2:2], "false", "true"
diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini
index 46626a2a12..7a82d66cc6 100644
--- a/firmware/tunerstudio/rusefi_microrusefi.ini
+++ b/firmware/tunerstudio/rusefi_microrusefi.ini
@@ -85,7 +85,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 integration\rusefi_config.txt Sun Mar 22 20:14:04 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Mon Mar 23 23:17:17 EDT 2020
 
 pageSize            = 20000
 page = 1
@@ -205,8 +205,8 @@ page = 1
 ;no TS info - skipping overrideCrankingIgnition offset 516
 	sensorChartFrequency			= scalar, S32,	520,	"index", 1, 0, 0, 300, 0 ; size 4
 	trigger_type				 = bits, U32, 524, [0:7], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "trg44", "trg45", "INVALID"
-	trigger_unusedTriggerBit0= bits,    U32,   	528, [0:0], "false", "true"
-	trigger_unusedTriggerBit1= bits,    U32,   	528, [1:1], "false", "true"
+	trigger_todoRemoveMeOneDay0= bits,    U32,   	528, [0:0], "false", "true"
+	trigger_todoRemoveMeOneDay1= bits,    U32,   	528, [1:1], "false", "true"
 	trigger_useOnlyFirstChannel= bits,    U32,   	528, [2:2], "false", "true"
 	trigger_unusedBit_4_3	= bits,    U32,   	528, [3:3], "false", "true"
 	trigger_unusedBit_4_4	= bits,    U32,   	528, [4:4], "false", "true"
@@ -456,8 +456,9 @@ page = 1
 	mapMinBufferLength				= scalar, S32,	812,	"count", 1, 0, 0, 24, 0
 	idlePidDeactivationTpsThreshold		= scalar, S16,	816,	"%", 1, 0, 0, 100.0, 0
 	stepperParkingExtraSteps		= scalar, S16,	818,	"%", 1, 0, 0, 3000.0, 0
-	unusedmiataNb2VVTRatioFrom		= scalar, F32,	820,	"value", 1, 0, 0, 1000, 5
-	unusedmiataNb2VVTRatioTo		= scalar, F32,	824,	"value", 1, 0, 0, 1000, 5
+;no TS info - skipping antilagTimeout offset 820
+;no TS info - skipping antiLagRpmTreshold offset 824
+;no TS info - skipping anotherUnused offset 826
 	triggerErrorPin				 = bits, U08, 828, [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","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	triggerErrorPinMode			 = bits, U08, 829, [0:7], "default", "default inverted", "open collector", "open collector inverted"
 	acRelayPin					 = bits, U08, 830, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","12 - Ignition 4","11 - Ignition 3","10 - Ignition 2","9 - Ignition 1","INVALID","13 - GP Out 6","14 - GP Out 5","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","35 - GP Out 1","7 - Lowside 1","3 - Lowside 2","42 - Injector 4","41 - Injector 3","38 - Injector 2","37 - Injector 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","34 - GP Out 2","33 - GP Out 3","43 - GP Out 4","INVALID","INVALID","INVALID"
@@ -539,9 +540,9 @@ page = 1
 	todoClutchDownPinInverted= bits,    U32,   	976, [1:1], "false", "true"
 	useHbridges				= bits,    U32,   	976, [2:2], "false", "true"
 	multisparkEnable		= bits,    U32,   	976, [3:3], "false", "true"
-	unusedBit_251_4			= bits,    U32,   	976, [4:4], "false", "true"
-	unusedBit_251_5			= bits,    U32,   	976, [5:5], "false", "true"
-	unusedBit_251_6			= bits,    U32,   	976, [6:6], "false", "true"
+	enableLaunchRetard		= bits,    U32,   	976, [4:4], "false", "true"
+	enableLaunchBoost		= bits,    U32,   	976, [5:5], "false", "true"
+	launchDisableBySpeed	= bits,    U32,   	976, [6:6], "false", "true"
 	unusedBit_251_7			= bits,    U32,   	976, [7:7], "false", "true"
 	unusedBit_251_8			= bits,    U32,   	976, [8:8], "false", "true"
 	unusedBit_251_9			= bits,    U32,   	976, [9:9], "false", "true"
@@ -565,8 +566,8 @@ page = 1
 	unusedBit_251_27		= bits,    U32,   	976, [27:27], "false", "true"
 	unusedBit_251_28		= bits,    U32,   	976, [28:28], "false", "true"
 	unusedBit_251_29		= bits,    U32,   	976, [29:29], "false", "true"
-	unusedBit_280_30		= bits,    U32,   	976, [30:30], "false", "true"
-	unusedBit_280_31		= bits,    U32,   	976, [31:31], "false", "true"
+	unusedBit_281_30		= bits,    U32,   	976, [30:30], "false", "true"
+	unusedBit_281_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","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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_controlPin1			 = 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","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -596,7 +597,10 @@ page = 1
 	launchFuelAdded					= scalar, S32,	1040,	"%", 1, 0, 0, 100.0, 0
 	launchBoostDuty					= scalar, S32,	1044,	"%", 1, 0, 0, 100.0, 0
 	hardCutRpmRange					= scalar, S32,	1048,	"rpm", 1, 0, 0, 3000.0, 2
-;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1052
+;no TS info - skipping launchAdvanceRpmRange offset 1052
+;no TS info - skipping launchTpsTreshold offset 1056
+;no TS info - skipping launchActivateDelay offset 1060
+;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1064
 	vvtDisplayInverted		= bits,    U32,   	1464, [0:0], "false", "true"
 	fuelClosedLoopCorrectionEnabled= bits,    U32,   	1464, [1:1], "false", "true"
 	isVerboseIAC			= bits,    U32,   	1464, [2:2], "false", "true"
@@ -3610,7 +3614,7 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "aux valve #1", 						auxValves1
 		field = "aux valve #2", 						auxValves2
 		field = "Start/Stop Button",					startStopButtonPin
-		field = ""			
+		field = "External Knock",						externalKnockSenseAdc
 		
 	dialog = fsioFrequency, "Frequency"
 		field = "freq #1", 								fsioFrequency1
diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini
index 1ece3a3b72..7f3e65d88a 100644
--- a/firmware/tunerstudio/rusefi_prometheus.ini
+++ b/firmware/tunerstudio/rusefi_prometheus.ini
@@ -85,7 +85,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 integration\rusefi_config.txt Sun Mar 22 20:14:11 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Mon Mar 23 23:17:23 EDT 2020
 
 pageSize            = 20000
 page = 1
@@ -205,8 +205,8 @@ page = 1
 ;no TS info - skipping overrideCrankingIgnition offset 516
 	sensorChartFrequency			= scalar, S32,	520,	"index", 1, 0, 0, 300, 0 ; size 4
 	trigger_type				 = bits, U32, 524, [0:7], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "trg44", "trg45", "INVALID"
-	trigger_unusedTriggerBit0= bits,    U32,   	528, [0:0], "false", "true"
-	trigger_unusedTriggerBit1= bits,    U32,   	528, [1:1], "false", "true"
+	trigger_todoRemoveMeOneDay0= bits,    U32,   	528, [0:0], "false", "true"
+	trigger_todoRemoveMeOneDay1= bits,    U32,   	528, [1:1], "false", "true"
 	trigger_useOnlyFirstChannel= bits,    U32,   	528, [2:2], "false", "true"
 	trigger_unusedBit_4_3	= bits,    U32,   	528, [3:3], "false", "true"
 	trigger_unusedBit_4_4	= bits,    U32,   	528, [4:4], "false", "true"
@@ -456,8 +456,9 @@ page = 1
 	mapMinBufferLength				= scalar, S32,	812,	"count", 1, 0, 0, 24, 0
 	idlePidDeactivationTpsThreshold		= scalar, S16,	816,	"%", 1, 0, 0, 100.0, 0
 	stepperParkingExtraSteps		= scalar, S16,	818,	"%", 1, 0, 0, 3000.0, 0
-	unusedmiataNb2VVTRatioFrom		= scalar, F32,	820,	"value", 1, 0, 0, 1000, 5
-	unusedmiataNb2VVTRatioTo		= scalar, F32,	824,	"value", 1, 0, 0, 1000, 5
+;no TS info - skipping antilagTimeout offset 820
+;no TS info - skipping antiLagRpmTreshold offset 824
+;no TS info - skipping anotherUnused offset 826
 	triggerErrorPin				 = bits, U08, 828, [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","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	triggerErrorPinMode			 = bits, U08, 829, [0:7], "default", "default inverted", "open collector", "open collector inverted"
 	acRelayPin					 = bits, U08, 830, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Injector 3Z","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
@@ -539,9 +540,9 @@ page = 1
 	todoClutchDownPinInverted= bits,    U32,   	976, [1:1], "false", "true"
 	useHbridges				= bits,    U32,   	976, [2:2], "false", "true"
 	multisparkEnable		= bits,    U32,   	976, [3:3], "false", "true"
-	unusedBit_251_4			= bits,    U32,   	976, [4:4], "false", "true"
-	unusedBit_251_5			= bits,    U32,   	976, [5:5], "false", "true"
-	unusedBit_251_6			= bits,    U32,   	976, [6:6], "false", "true"
+	enableLaunchRetard		= bits,    U32,   	976, [4:4], "false", "true"
+	enableLaunchBoost		= bits,    U32,   	976, [5:5], "false", "true"
+	launchDisableBySpeed	= bits,    U32,   	976, [6:6], "false", "true"
 	unusedBit_251_7			= bits,    U32,   	976, [7:7], "false", "true"
 	unusedBit_251_8			= bits,    U32,   	976, [8:8], "false", "true"
 	unusedBit_251_9			= bits,    U32,   	976, [9:9], "false", "true"
@@ -565,8 +566,8 @@ page = 1
 	unusedBit_251_27		= bits,    U32,   	976, [27:27], "false", "true"
 	unusedBit_251_28		= bits,    U32,   	976, [28:28], "false", "true"
 	unusedBit_251_29		= bits,    U32,   	976, [29:29], "false", "true"
-	unusedBit_280_30		= bits,    U32,   	976, [30:30], "false", "true"
-	unusedBit_280_31		= bits,    U32,   	976, [31:31], "false", "true"
+	unusedBit_281_30		= bits,    U32,   	976, [30:30], "false", "true"
+	unusedBit_281_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","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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_controlPin1			 = 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","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -596,7 +597,10 @@ page = 1
 	launchFuelAdded					= scalar, S32,	1040,	"%", 1, 0, 0, 100.0, 0
 	launchBoostDuty					= scalar, S32,	1044,	"%", 1, 0, 0, 100.0, 0
 	hardCutRpmRange					= scalar, S32,	1048,	"rpm", 1, 0, 0, 3000.0, 2
-;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1052
+;no TS info - skipping launchAdvanceRpmRange offset 1052
+;no TS info - skipping launchTpsTreshold offset 1056
+;no TS info - skipping launchActivateDelay offset 1060
+;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1064
 	vvtDisplayInverted		= bits,    U32,   	1464, [0:0], "false", "true"
 	fuelClosedLoopCorrectionEnabled= bits,    U32,   	1464, [1:1], "false", "true"
 	isVerboseIAC			= bits,    U32,   	1464, [2:2], "false", "true"
@@ -3625,7 +3629,7 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "aux valve #1", 						auxValves1
 		field = "aux valve #2", 						auxValves2
 		field = "Start/Stop Button",					startStopButtonPin
-		field = ""			
+		field = "External Knock",						externalKnockSenseAdc
 		
 	dialog = fsioFrequency, "Frequency"
 		field = "freq #1", 								fsioFrequency1
diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini
index 2514969ed6..8106ecab8d 100644
--- a/firmware/tunerstudio/rusefi_proteus.ini
+++ b/firmware/tunerstudio/rusefi_proteus.ini
@@ -85,7 +85,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 integration\rusefi_config.txt Sun Mar 22 20:14:14 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Mon Mar 23 23:17:26 EDT 2020
 
 pageSize            = 20000
 page = 1
@@ -205,8 +205,8 @@ page = 1
 ;no TS info - skipping overrideCrankingIgnition offset 516
 	sensorChartFrequency			= scalar, S32,	520,	"index", 1, 0, 0, 300, 0 ; size 4
 	trigger_type				 = bits, U32, 524, [0:7], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "trg44", "trg45", "INVALID"
-	trigger_unusedTriggerBit0= bits,    U32,   	528, [0:0], "false", "true"
-	trigger_unusedTriggerBit1= bits,    U32,   	528, [1:1], "false", "true"
+	trigger_todoRemoveMeOneDay0= bits,    U32,   	528, [0:0], "false", "true"
+	trigger_todoRemoveMeOneDay1= bits,    U32,   	528, [1:1], "false", "true"
 	trigger_useOnlyFirstChannel= bits,    U32,   	528, [2:2], "false", "true"
 	trigger_unusedBit_4_3	= bits,    U32,   	528, [3:3], "false", "true"
 	trigger_unusedBit_4_4	= bits,    U32,   	528, [4:4], "false", "true"
@@ -456,8 +456,9 @@ page = 1
 	mapMinBufferLength				= scalar, S32,	812,	"count", 1, 0, 0, 24, 0
 	idlePidDeactivationTpsThreshold		= scalar, S16,	816,	"%", 1, 0, 0, 100.0, 0
 	stepperParkingExtraSteps		= scalar, S16,	818,	"%", 1, 0, 0, 3000.0, 0
-	unusedmiataNb2VVTRatioFrom		= scalar, F32,	820,	"value", 1, 0, 0, 1000, 5
-	unusedmiataNb2VVTRatioTo		= scalar, F32,	824,	"value", 1, 0, 0, 1000, 5
+;no TS info - skipping antilagTimeout offset 820
+;no TS info - skipping antiLagRpmTreshold offset 824
+;no TS info - skipping anotherUnused offset 826
 	triggerErrorPin				 = bits, U08, 828, [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","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	triggerErrorPinMode			 = bits, U08, 829, [0:7], "default", "default inverted", "open collector", "open collector inverted"
 	acRelayPin					 = bits, U08, 830, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Highside 2","Highside 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Lowside 8","Lowside 9","Lowside 10","Lowside 11","Lowside 12","Lowside 13","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 5","Ign 4","Ign 3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 2","Ign 1","INVALID","INVALID","Lowside 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Highside 4","Highside 3","Lowside 14","Lowside 15","Lowside 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","Ign 12","Ign 11","Ign 10","Ign 9","Ign 8","Ign 7","Ign 6","Lowside 2","Lowside 3","Lowside 4","Lowside 5","Lowside 6","Lowside 7","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
@@ -539,9 +540,9 @@ page = 1
 	todoClutchDownPinInverted= bits,    U32,   	976, [1:1], "false", "true"
 	useHbridges				= bits,    U32,   	976, [2:2], "false", "true"
 	multisparkEnable		= bits,    U32,   	976, [3:3], "false", "true"
-	unusedBit_251_4			= bits,    U32,   	976, [4:4], "false", "true"
-	unusedBit_251_5			= bits,    U32,   	976, [5:5], "false", "true"
-	unusedBit_251_6			= bits,    U32,   	976, [6:6], "false", "true"
+	enableLaunchRetard		= bits,    U32,   	976, [4:4], "false", "true"
+	enableLaunchBoost		= bits,    U32,   	976, [5:5], "false", "true"
+	launchDisableBySpeed	= bits,    U32,   	976, [6:6], "false", "true"
 	unusedBit_251_7			= bits,    U32,   	976, [7:7], "false", "true"
 	unusedBit_251_8			= bits,    U32,   	976, [8:8], "false", "true"
 	unusedBit_251_9			= bits,    U32,   	976, [9:9], "false", "true"
@@ -565,8 +566,8 @@ page = 1
 	unusedBit_251_27		= bits,    U32,   	976, [27:27], "false", "true"
 	unusedBit_251_28		= bits,    U32,   	976, [28:28], "false", "true"
 	unusedBit_251_29		= bits,    U32,   	976, [29:29], "false", "true"
-	unusedBit_280_30		= bits,    U32,   	976, [30:30], "false", "true"
-	unusedBit_280_31		= bits,    U32,   	976, [31:31], "false", "true"
+	unusedBit_281_30		= bits,    U32,   	976, [30:30], "false", "true"
+	unusedBit_281_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","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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_controlPin1			 = 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","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -596,7 +597,10 @@ page = 1
 	launchFuelAdded					= scalar, S32,	1040,	"%", 1, 0, 0, 100.0, 0
 	launchBoostDuty					= scalar, S32,	1044,	"%", 1, 0, 0, 100.0, 0
 	hardCutRpmRange					= scalar, S32,	1048,	"rpm", 1, 0, 0, 3000.0, 2
-;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1052
+;no TS info - skipping launchAdvanceRpmRange offset 1052
+;no TS info - skipping launchTpsTreshold offset 1056
+;no TS info - skipping launchActivateDelay offset 1060
+;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1064
 	vvtDisplayInverted		= bits,    U32,   	1464, [0:0], "false", "true"
 	fuelClosedLoopCorrectionEnabled= bits,    U32,   	1464, [1:1], "false", "true"
 	isVerboseIAC			= bits,    U32,   	1464, [2:2], "false", "true"
@@ -3618,7 +3622,7 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "aux valve #1", 						auxValves1
 		field = "aux valve #2", 						auxValves2
 		field = "Start/Stop Button",					startStopButtonPin
-		field = ""			
+		field = "External Knock",						externalKnockSenseAdc
 		
 	dialog = fsioFrequency, "Frequency"
 		field = "freq #1", 								fsioFrequency1
diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java
index 47f5434287..9f8f1e5263 100644
--- a/java_console/models/src/com/rusefi/config/generated/Fields.java
+++ b/java_console/models/src/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 integration\rusefi_config.txt Sun Mar 22 20:14:01 EDT 2020
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Mon Mar 23 22:05:45 EDT 2020
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
@@ -57,10 +57,15 @@ public class Fields {
 	public static final int alternatorPwmFrequency_offset = 2256;
 	public static final int ambiguousOperationMode_offset = 488;
 	public static final int analogInputDividerCoefficient_offset = 460;
+	public static final int anotherUnused_offset = 826;
 	public static final int antiLagActivatePin_offset = 990;
 	public static final int antiLagActivationMode_offset = 1024;
 	public static final int antiLagActivationMode_offset_hex = 400;
 	public static final int antiLagEnabled_offset = 76;
+	public static final int antiLagRpmTreshold_offset = 824;
+	public static final int antiLagRpmTreshold_offset_hex = 338;
+	public static final int antilagTimeout_offset = 820;
+	public static final int antilagTimeout_offset_hex = 334;
 	public static final int autoTuneCltThreshold_offset = 2420;
 	public static final int autoTuneCltThreshold_offset_hex = 974;
 	public static final int autoTuneTpsQuietPeriod_offset = 2428;
@@ -345,6 +350,8 @@ public class Fields {
 	public static final int electronicThrottlePin1Mode_offset = 672;
 	public static final int enableAemXSeries_offset = 744;
 	public static final int enabledStep1Limiter_offset = 744;
+	public static final int enableLaunchBoost_offset = 976;
+	public static final int enableLaunchRetard_offset = 976;
 	public static final int enableVerboseCanTx_offset = 744;
 	public static final int ENGINE_NOISE_CURVE_SIZE = 8;
 	public static final int engineChartSize_offset = 1480;
@@ -929,11 +936,15 @@ public class Fields {
 	public static final int knockNoise_offset = 1820;
 	public static final int knockNoiseRpmBins_offset = 1852;
 	public static final int knockVThreshold_offset = 1512;
+	public static final int launchActivateDelay_offset = 1060;
+	public static final int launchActivateDelay_offset_hex = 424;
 	public static final int launchActivatePin_offset = 991;
 	public static final int launchActivationMode_offset = 1020;
+	public static final int launchAdvanceRpmRange_offset = 1052;
 	public static final int launchBoostDuty_offset = 1044;
 	public static final int launchBoostDuty_offset_hex = 414;
 	public static final int launchControlEnabled_offset = 76;
+	public static final int launchDisableBySpeed_offset = 976;
 	public static final int launchFuelAdded_offset = 1040;
 	public static final int launchFuelAdded_offset_hex = 410;
 	public static final int launchFuelCutEnable_offset = 1464;
@@ -947,6 +958,8 @@ public class Fields {
 	public static final int launchTimingRetard_offset = 320;
 	public static final int launchTimingRetard_offset_hex = 140;
 	public static final int launchTimingRpmRange_offset = 1036;
+	public static final int launchTpsTreshold_offset = 1056;
+	public static final int launchTpsTreshold_offset_hex = 420;
 	public static final int lcdThreadPeriodMs_offset = 720;
 	public static final int LDS_ALTERNATOR_PID_STATE_INDEX = 9;
 	public static final int LDS_CJ125_PID_STATE_INDEX = 10;
@@ -1273,6 +1286,10 @@ public class Fields {
 	public static final int TRIGGER_INPUT_PIN_COUNT = 3;
 	public static final int trigger_offset = 524;
 	public static final int TRIGGER_SIMULATOR_PIN_COUNT = 3;
+	public static final int trigger_todoRemoveMeOneDay0_offset = 528;
+	public static final int trigger_todoRemoveMeOneDay0_offset_hex = 210;
+	public static final int trigger_todoRemoveMeOneDay1_offset = 528;
+	public static final int trigger_todoRemoveMeOneDay1_offset_hex = 210;
 	public static final int trigger_type_offset = 524;
 	public static final int trigger_unusedBit_4_10_offset = 528;
 	public static final int trigger_unusedBit_4_10_offset_hex = 210;
@@ -1332,10 +1349,6 @@ public class Fields {
 	public static final int trigger_unusedBit_4_8_offset_hex = 210;
 	public static final int trigger_unusedBit_4_9_offset = 528;
 	public static final int trigger_unusedBit_4_9_offset_hex = 210;
-	public static final int trigger_unusedTriggerBit0_offset = 528;
-	public static final int trigger_unusedTriggerBit0_offset_hex = 210;
-	public static final int trigger_unusedTriggerBit1_offset = 528;
-	public static final int trigger_unusedTriggerBit1_offset_hex = 210;
 	public static final int trigger_useOnlyFirstChannel_offset = 528;
 	public static final int trigger_useOnlyFirstChannel_offset_hex = 210;
 	public static final int triggerCompCenterVolt_offset = 4036;
@@ -1374,7 +1387,8 @@ public class Fields {
 	public static final int unused_1484_bit_31_offset = 1476;
 	public static final int unused_former_warmup_target_afr_offset = 2096;
 	public static final int unused_former_warmup_target_afr_offset_hex = 830;
-	public static final int unusedAtOldBoardConfigurationEnd_offset = 1052;
+	public static final int unusedAtOldBoardConfigurationEnd_offset = 1064;
+	public static final int unusedAtOldBoardConfigurationEnd_offset_hex = 428;
 	public static final int unusedBit4_1476_offset = 1476;
 	public static final int unusedBit_251_10_offset = 976;
 	public static final int unusedBit_251_11_offset = 976;
@@ -1396,22 +1410,15 @@ public class Fields {
 	public static final int unusedBit_251_27_offset = 976;
 	public static final int unusedBit_251_28_offset = 976;
 	public static final int unusedBit_251_29_offset = 976;
-	public static final int unusedBit_251_4_offset = 976;
-	public static final int unusedBit_251_5_offset = 976;
-	public static final int unusedBit_251_6_offset = 976;
 	public static final int unusedBit_251_7_offset = 976;
 	public static final int unusedBit_251_8_offset = 976;
 	public static final int unusedBit_251_9_offset = 976;
-	public static final int unusedBit_280_30_offset = 976;
-	public static final int unusedBit_280_31_offset = 976;
+	public static final int unusedBit_281_30_offset = 976;
+	public static final int unusedBit_281_31_offset = 976;
 	public static final int unusedBit_34_31_offset = 76;
 	public static final int unusedErrorPin_offset = 2040;
 	public static final int unusedFlexFuelSensor_offset = 3100;
 	public static final int unusedFormerWarmupAfrPid_offset = 1774;
-	public static final int unusedmiataNb2VVTRatioFrom_offset = 820;
-	public static final int unusedmiataNb2VVTRatioFrom_offset_hex = 334;
-	public static final int unusedmiataNb2VVTRatioTo_offset = 824;
-	public static final int unusedmiataNb2VVTRatioTo_offset_hex = 338;
 	public static final int unusedSpiPadding4_offset = 2593;
 	public static final int unusedSpiPadding5_offset = 2713;
 	public static final int unusedSpiPadding7_offset = 4005;
@@ -1591,8 +1598,8 @@ public class Fields {
 	public static final Field SENSORCHARTFREQUENCY = Field.create("SENSORCHARTFREQUENCY", 520, FieldType.INT);
 	public static final String[] trigger_type_e = {"custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "trg44", "trg45", "INVALID"};
 	public static final Field TRIGGER_TYPE = Field.create("TRIGGER_TYPE", 524, FieldType.INT, trigger_type_e);
-	public static final Field TRIGGER_UNUSEDTRIGGERBIT0 = Field.create("TRIGGER_UNUSEDTRIGGERBIT0", 528, FieldType.BIT, 0);
-	public static final Field TRIGGER_UNUSEDTRIGGERBIT1 = Field.create("TRIGGER_UNUSEDTRIGGERBIT1", 528, FieldType.BIT, 1);
+	public static final Field TRIGGER_TODOREMOVEMEONEDAY0 = Field.create("TRIGGER_TODOREMOVEMEONEDAY0", 528, FieldType.BIT, 0);
+	public static final Field TRIGGER_TODOREMOVEMEONEDAY1 = Field.create("TRIGGER_TODOREMOVEMEONEDAY1", 528, FieldType.BIT, 1);
 	public static final Field TRIGGER_USEONLYFIRSTCHANNEL = Field.create("TRIGGER_USEONLYFIRSTCHANNEL", 528, FieldType.BIT, 2);
 	public static final Field TRIGGER_UNUSEDBIT_4_3 = Field.create("TRIGGER_UNUSEDBIT_4_3", 528, FieldType.BIT, 3);
 	public static final Field TRIGGER_UNUSEDBIT_4_4 = Field.create("TRIGGER_UNUSEDBIT_4_4", 528, FieldType.BIT, 4);
@@ -1847,8 +1854,9 @@ public class Fields {
 	public static final Field MAPMINBUFFERLENGTH = Field.create("MAPMINBUFFERLENGTH", 812, FieldType.INT);
 	public static final Field IDLEPIDDEACTIVATIONTPSTHRESHOLD = Field.create("IDLEPIDDEACTIVATIONTPSTHRESHOLD", 816, FieldType.INT16);
 	public static final Field STEPPERPARKINGEXTRASTEPS = Field.create("STEPPERPARKINGEXTRASTEPS", 818, FieldType.INT16);
-	public static final Field UNUSEDMIATANB2VVTRATIOFROM = Field.create("UNUSEDMIATANB2VVTRATIOFROM", 820, FieldType.FLOAT);
-	public static final Field UNUSEDMIATANB2VVTRATIOTO = Field.create("UNUSEDMIATANB2VVTRATIOTO", 824, FieldType.FLOAT);
+	public static final Field ANTILAGTIMEOUT = Field.create("ANTILAGTIMEOUT", 820, FieldType.FLOAT);
+	public static final Field ANTILAGRPMTRESHOLD = Field.create("ANTILAGRPMTRESHOLD", 824, FieldType.INT16);
+	public static final Field ANOTHERUNUSED = Field.create("ANOTHERUNUSED", 826, FieldType.INT16);
 	public static final Field TRIGGERERRORPIN = Field.create("TRIGGERERRORPIN", 828, FieldType.INT8, brain_pin_e);
 	public static final Field TRIGGERERRORPINMODE = Field.create("TRIGGERERRORPINMODE", 829, FieldType.INT8, pin_output_mode_e);
 	public static final Field ACRELAYPIN = Field.create("ACRELAYPIN", 830, FieldType.INT8, output_pin_e);
@@ -1932,9 +1940,9 @@ public class Fields {
 	public static final Field TODOCLUTCHDOWNPININVERTED = Field.create("TODOCLUTCHDOWNPININVERTED", 976, FieldType.BIT, 1);
 	public static final Field USEHBRIDGES = Field.create("USEHBRIDGES", 976, FieldType.BIT, 2);
 	public static final Field MULTISPARKENABLE = Field.create("MULTISPARKENABLE", 976, FieldType.BIT, 3);
-	public static final Field UNUSEDBIT_251_4 = Field.create("UNUSEDBIT_251_4", 976, FieldType.BIT, 4);
-	public static final Field UNUSEDBIT_251_5 = Field.create("UNUSEDBIT_251_5", 976, FieldType.BIT, 5);
-	public static final Field UNUSEDBIT_251_6 = Field.create("UNUSEDBIT_251_6", 976, FieldType.BIT, 6);
+	public static final Field ENABLELAUNCHRETARD = Field.create("ENABLELAUNCHRETARD", 976, FieldType.BIT, 4);
+	public static final Field ENABLELAUNCHBOOST = Field.create("ENABLELAUNCHBOOST", 976, FieldType.BIT, 5);
+	public static final Field LAUNCHDISABLEBYSPEED = Field.create("LAUNCHDISABLEBYSPEED", 976, FieldType.BIT, 6);
 	public static final Field UNUSEDBIT_251_7 = Field.create("UNUSEDBIT_251_7", 976, FieldType.BIT, 7);
 	public static final Field UNUSEDBIT_251_8 = Field.create("UNUSEDBIT_251_8", 976, FieldType.BIT, 8);
 	public static final Field UNUSEDBIT_251_9 = Field.create("UNUSEDBIT_251_9", 976, FieldType.BIT, 9);
@@ -1958,8 +1966,8 @@ public class Fields {
 	public static final Field UNUSEDBIT_251_27 = Field.create("UNUSEDBIT_251_27", 976, FieldType.BIT, 27);
 	public static final Field UNUSEDBIT_251_28 = Field.create("UNUSEDBIT_251_28", 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_280_30 = Field.create("UNUSEDBIT_280_30", 976, FieldType.BIT, 30);
-	public static final Field UNUSEDBIT_280_31 = Field.create("UNUSEDBIT_280_31", 976, FieldType.BIT, 31);
+	public static final Field UNUSEDBIT_281_30 = Field.create("UNUSEDBIT_281_30", 976, FieldType.BIT, 30);
+	public static final Field UNUSEDBIT_281_31 = Field.create("UNUSEDBIT_281_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_CONTROLPIN1 = Field.create("ETBIO1_CONTROLPIN1", 982, FieldType.INT8, brain_pin_e);
@@ -1991,6 +1999,9 @@ public class Fields {
 	public static final Field LAUNCHFUELADDED = Field.create("LAUNCHFUELADDED", 1040, FieldType.INT);
 	public static final Field LAUNCHBOOSTDUTY = Field.create("LAUNCHBOOSTDUTY", 1044, FieldType.INT);
 	public static final Field HARDCUTRPMRANGE = Field.create("HARDCUTRPMRANGE", 1048, FieldType.INT);
+	public static final Field LAUNCHADVANCERPMRANGE = Field.create("LAUNCHADVANCERPMRANGE", 1052, FieldType.INT);
+	public static final Field LAUNCHTPSTRESHOLD = Field.create("LAUNCHTPSTRESHOLD", 1056, FieldType.INT);
+	public static final Field LAUNCHACTIVATEDELAY = Field.create("LAUNCHACTIVATEDELAY", 1060, FieldType.FLOAT);
 	public static final Field VVTDISPLAYINVERTED = Field.create("VVTDISPLAYINVERTED", 1464, FieldType.BIT, 0);
 	public static final Field FUELCLOSEDLOOPCORRECTIONENABLED = Field.create("FUELCLOSEDLOOPCORRECTIONENABLED", 1464, FieldType.BIT, 1);
 	public static final Field ISVERBOSEIAC = Field.create("ISVERBOSEIAC", 1464, FieldType.BIT, 2);
@@ -2504,8 +2515,8 @@ public class Fields {
 	OVERRIDECRANKINGIGNITION,
 	SENSORCHARTFREQUENCY,
 	TRIGGER_TYPE,
-	TRIGGER_UNUSEDTRIGGERBIT0,
-	TRIGGER_UNUSEDTRIGGERBIT1,
+	TRIGGER_TODOREMOVEMEONEDAY0,
+	TRIGGER_TODOREMOVEMEONEDAY1,
 	TRIGGER_USEONLYFIRSTCHANNEL,
 	TRIGGER_UNUSEDBIT_4_3,
 	TRIGGER_UNUSEDBIT_4_4,
@@ -2753,8 +2764,9 @@ public class Fields {
 	MAPMINBUFFERLENGTH,
 	IDLEPIDDEACTIVATIONTPSTHRESHOLD,
 	STEPPERPARKINGEXTRASTEPS,
-	UNUSEDMIATANB2VVTRATIOFROM,
-	UNUSEDMIATANB2VVTRATIOTO,
+	ANTILAGTIMEOUT,
+	ANTILAGRPMTRESHOLD,
+	ANOTHERUNUSED,
 	TRIGGERERRORPIN,
 	TRIGGERERRORPINMODE,
 	ACRELAYPIN,
@@ -2836,9 +2848,9 @@ public class Fields {
 	TODOCLUTCHDOWNPININVERTED,
 	USEHBRIDGES,
 	MULTISPARKENABLE,
-	UNUSEDBIT_251_4,
-	UNUSEDBIT_251_5,
-	UNUSEDBIT_251_6,
+	ENABLELAUNCHRETARD,
+	ENABLELAUNCHBOOST,
+	LAUNCHDISABLEBYSPEED,
 	UNUSEDBIT_251_7,
 	UNUSEDBIT_251_8,
 	UNUSEDBIT_251_9,
@@ -2862,8 +2874,8 @@ public class Fields {
 	UNUSEDBIT_251_27,
 	UNUSEDBIT_251_28,
 	UNUSEDBIT_251_29,
-	UNUSEDBIT_280_30,
-	UNUSEDBIT_280_31,
+	UNUSEDBIT_281_30,
+	UNUSEDBIT_281_31,
 	ETBIO1_DIRECTIONPIN1,
 	ETBIO1_DIRECTIONPIN2,
 	ETBIO1_CONTROLPIN1,
@@ -2893,6 +2905,9 @@ public class Fields {
 	LAUNCHFUELADDED,
 	LAUNCHBOOSTDUTY,
 	HARDCUTRPMRANGE,
+	LAUNCHADVANCERPMRANGE,
+	LAUNCHTPSTRESHOLD,
+	LAUNCHACTIVATEDELAY,
 	VVTDISPLAYINVERTED,
 	FUELCLOSEDLOOPCORRECTIONENABLED,
 	ISVERBOSEIAC,
diff --git a/unit_tests/efifeatures.h b/unit_tests/efifeatures.h
index 47f7cd739b..c7c1fe99e1 100644
--- a/unit_tests/efifeatures.h
+++ b/unit_tests/efifeatures.h
@@ -16,6 +16,10 @@
 
 #define ENABLE_PERF_TRACE FALSE
 
+#define EFI_LAUNCH_CONTROL TRUE
+
+#define EFI_BOOST_CONTROL TRUE
+
 #define EFI_IDLE_CONTROL TRUE
 
 #define EFI_ELECTRONIC_THROTTLE_BODY TRUE