diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp
index a23eb785ba..0b5a720cf7 100644
--- a/firmware/controllers/algo/engine.cpp
+++ b/firmware/controllers/algo/engine.cpp
@@ -150,8 +150,9 @@ void Engine::initializeTriggerWaveform(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 	if (CONFIG(overrideTriggerGaps)) {
 		int gapIndex = 0;
 		for (;gapIndex<=CONFIG(overrideTriggerGaps);gapIndex++) {
-			float gapOverride = CONFIG(triggerGapOverride[gapIndex]);
-			TRIGGER_WAVEFORM(setTriggerSynchronizationGap3(/*gapIndex*/gapIndex, gapOverride * TRIGGER_GAP_DEVIATION_LOW, gapOverride * TRIGGER_GAP_DEVIATION_HIGH));
+			float gapOverrideFrom = CONFIG(triggerGapOverrideFrom[gapIndex]);
+			float gapOverrideTo = CONFIG(triggerGapOverrideTo[gapIndex]);
+			TRIGGER_WAVEFORM(setTriggerSynchronizationGap3(/*gapIndex*/gapIndex, gapOverrideFrom, gapOverrideTo));
 		}
 		for (;gapIndex<GAP_TRACKING_LENGTH;gapIndex++) {
 			ENGINE(triggerCentral.triggerShape).syncronizationRatioFrom[gapIndex] = NAN;
diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp
index ffe30465fc..6248cbe2d4 100644
--- a/firmware/controllers/trigger/trigger_central.cpp
+++ b/firmware/controllers/trigger/trigger_central.cpp
@@ -791,8 +791,9 @@ void onConfigurationChangeTriggerCallback(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 		changed |= isConfigurationChanged(vvtOffsets[camIndex]);
 	}
 
-	for (size_t i = 0; i < efi::size(CONFIG(triggerGapOverride)); i++) {
-		changed |= isConfigurationChanged(triggerGapOverride[i]);
+	for (size_t i = 0; i < efi::size(CONFIG(triggerGapOverrideFrom)); i++) {
+		changed |= isConfigurationChanged(triggerGapOverrideFrom[i]);
+		changed |= isConfigurationChanged(triggerGapOverrideTo[i]);
 	}
 
 	for (size_t i = 0; i < efi::size(CONFIG(triggerInputPins)); i++) {
diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index 465c67fb44..8c6560aad4 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -1476,11 +1476,12 @@ tChargeMode_e tChargeMode;
 
 	int8_t[IGN_RPM_COUNT] knockBaseNoise;;"dB", 1, 0, -30, 0, 2
 
-	float[GAP_TRACKING_LENGTH iterate] triggerGapOverride;;"ratio", 1, 0, 0, 20, 2
+	float[GAP_TRACKING_LENGTH iterate] triggerGapOverrideFrom;;"from", 1, 0, 0, 20, 2
 
 int8_t[MAX_CYLINDER_COUNT iterate] fuelTrim;;"Percent", @@PERCENT_TRIM_BYTE_PACKING_DIV@@, 0, -25, 25, 2
 
-	int[344] mainUnusedEnd;;"units", 1, 0, -20, 100, 0
+	float[GAP_TRACKING_LENGTH iterate] triggerGapOverrideTo;;"to", 1, 0, 0, 20, 2
+	int[326] mainUnusedEnd;;"units", 1, 0, -20, 100, 0
 
 ! end of engine_configuration_s
 end_struct
diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index c0fac7952f..30993b7956 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -1919,14 +1919,19 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
 		commandButton = "Enable Trigger debug mode",    cmd_test_debug_mode_trigger
 		field = "Override well known trigger gaps",    overrideTriggerGaps
 		field = gapTrackingLengthOverride,				gapTrackingLengthOverride, { overrideTriggerGaps == 1 }
-		field = "First gap",							triggerGapOverride1, { overrideTriggerGaps == 1 }
-		field = "Second gap",							triggerGapOverride2, { overrideTriggerGaps == 1 }
-		field = "Third gap",							triggerGapOverride3, { overrideTriggerGaps == 1 }
-		field = "Gap #4",	    						triggerGapOverride4, { overrideTriggerGaps == 1 }
-		field = "Gap #5",	    						triggerGapOverride5, { overrideTriggerGaps == 1 }
-		field = "Gap #6",	    						triggerGapOverride6, { overrideTriggerGaps == 1 }
-		field = "Gap #7",	    						triggerGapOverride7, { overrideTriggerGaps == 1 }
-		field = "Gap #8",	    						triggerGapOverride8, { overrideTriggerGaps == 1 }
+		field = "First gap from",						triggerGapOverrideFrom1, { overrideTriggerGaps == 1 }
+		field = "First gap to",		    				triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
+
+		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2,   { overrideTriggerGaps == 1 }
+
+		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
+		field = "Third gap to",	        				triggerGapOverrideTo3,   { overrideTriggerGaps == 1 }
+
+		field = "Gap #4 from",	   						triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
+		field = "Gap #4 to",	   						triggerGapOverrideTo4,   { overrideTriggerGaps == 1 }
+		field = "Gap #5 from",	   						triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
+		field = "Gap #5 to",	   						triggerGapOverrideTo5,   { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 	    field = "!https://rusefi.com/s/vvt"