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 6221f5f9dc..f90cf365e9 100644
--- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
+++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
@@ -568,7 +568,7 @@
 #define GAUGE_NAME_FUEL_IAT_CORR "fuel: IAT correction"
 #define GAUGE_NAME_FUEL_INJ_DUTY "fuel: injector duty cycle"
 #define GAUGE_NAME_FUEL_LAST_INJECTION "fuel: Last injection"
-#define GAUGE_NAME_FUEL_PID_CORR "fuel: Short-term closed loop correction"
+#define GAUGE_NAME_FUEL_PID_CORR "fuel: Short-term fuel trim"
 #define GAUGE_NAME_FUEL_RUNNING "fuel: running"
 #define GAUGE_NAME_FUEL_TPS_EXTRA "fuel: TPS acceleration extra fuel ms"
 #define GAUGE_NAME_FUEL_TPS_ROC "fuel: TPS change"
diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h
index 1f8823f715..06e64b5649 100644
--- a/firmware/controllers/generated/rusefi_generated.h
+++ b/firmware/controllers/generated/rusefi_generated.h
@@ -568,7 +568,7 @@
 #define GAUGE_NAME_FUEL_IAT_CORR "fuel: IAT correction"
 #define GAUGE_NAME_FUEL_INJ_DUTY "fuel: injector duty cycle"
 #define GAUGE_NAME_FUEL_LAST_INJECTION "fuel: Last injection"
-#define GAUGE_NAME_FUEL_PID_CORR "fuel: Short-term closed loop correction"
+#define GAUGE_NAME_FUEL_PID_CORR "fuel: Short-term fuel trim"
 #define GAUGE_NAME_FUEL_RUNNING "fuel: running"
 #define GAUGE_NAME_FUEL_TPS_EXTRA "fuel: TPS acceleration extra fuel ms"
 #define GAUGE_NAME_FUEL_TPS_ROC "fuel: TPS change"
diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini
index f5ccd62af0..43b2655179 100644
--- a/firmware/tunerstudio/rusefi.ini
+++ b/firmware/tunerstudio/rusefi.ini
@@ -89,7 +89,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun May 31 13:45:22 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun May 31 17:00:13 EDT 2020
 
 pageSize            = 20000
 page = 1
@@ -1545,7 +1545,7 @@ page = 1
       iatCorrection   = scalar,  S16,     64,        "%",{1/100},         0
       cltCorrection   = scalar,  S16,     66,        "%",{1/100},         0
       baroCorrection  = scalar,  S16,     68,        "%",{1/100},         0
-      fuelPidCorrection=scalar,  S16,     70,     "ms",{1/300},         0
+      fuelPidCorrection=scalar,  S16,     70,       "ms",{1/100},         0
 
 ; Wall model AE
       wallFuelAmount  = scalar,  U16,     72,     "ms",{1/300},         0
@@ -2280,7 +2280,7 @@ gaugeCategory = Fueling
    injectorLagMsGauge = injectorLagMs,       "fuel: injector lag",      "mSec",        0,   25.5,     1.0,    1.2,      20,    25,   3, 1
    fuelRunningGauge     = fuelRunning,       "fuel: running",      "mSec",        0,   25.5,     1.0,    1.2,      20,    25,   3, 1
    baseFuelGauge     = baseFuel,       "fuel: base",      "mSec",        0,   25.5,     1.0,    1.2,      20,    25,   3, 1
-   fuelPidCorrectionGauge = fuelPidCorrection,       "fuel: Short-term closed loop correction",      "mSec",        -11,   11,     1.0,    1.2,      20,    25,   3, 1
+   fuelPidCorrectionGauge = fuelPidCorrection,       "fuel: Short-term fuel trim",      "%",        -10,   10,     -8, -5, 5, 8,   3, 1
 
 gaugeCategory = Throttle Body (incl. ETB)
    pedalPositionGauge = throttlePedalPosition, "Throttle pedal position",        "%",    0,    120,      0,     0,     100,   100,   1,   1
@@ -2413,7 +2413,7 @@ gaugeCategory = Sensors - Raw
    entry = fuelRunning,     "fuel: running", float,  "%.3f"
    entry = actualLastInjection,     "fuel: Last injection", float,  "%.3f"
    entry = baseFuel,	    "fuel: base",  float,  "%.2f"
-   entry = fuelPidCorrection,"fuel: Short-term closed loop correction",  float,  "%.2f"
+   entry = fuelPidCorrection,"fuel: Short-term fuel trim",  float,  "%.2f"
    entry = veValue,         "fuel: VE",    float,  "%.3f"
    entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f"
    entry = coilDutyCycle,	"dwell: coil duty cycle",	float,"%.3f"
@@ -2552,7 +2552,7 @@ menuDialog = main
 
 		# Targets & closed loop
 		subMenu = afrTableTbl,				"Target AFR", 0, {isInjectionEnabled == 1 && (fuelAlgorithm == LM_SPEED_DENSITY || fuelAlgorithm == LM_REAL_MAF)}
-		subMenu = fuelClosedLoopDialog, 	"Closed loop correction", 0, {isInjectionEnabled == 1}
+		subMenu = fuelClosedLoopDialog, 	"Closed loop fuel correction", 0, {isInjectionEnabled == 1}
 		subMenu = coastingFuelCutControl, 	"Deceleration fuel cutoff (DFCO)", 0, {isInjectionEnabled == 1}
 		subMenu = std_separator
 
@@ -3723,23 +3723,46 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "SPI3sck mode",							spi3SckMode, {is_enabled_spi_3 == 1}
 		field = "LIS302DLCsPin",						LIS302DLCsPin
 
-	dialog = fuelClosedLoopDialog, "Fuel short-term closed-loop correction"
-		field = "#This is just the cherry on the cake once you have good VE table"
-		field = "Enabled",								fuelClosedLoopCorrectionEnabled
-		field = "!No correction below these value"
-		field = "CLT - low threshod", 					fuelClosedLoopCltThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "RPM - low threshod", 					fuelClosedLoopRpmThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "EGO - low threshod", 					fuelClosedLoopAfrLowThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "!No correction above these value"
-		field = "TPS - high threshod", 					fuelClosedLoopTpsThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "EGO - high threshod", 					fuelClosedLoopAfrHighThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "!PID settings"
-		field = "P factor",								fuelClosedLoopPid_pFactor, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "I factor",								fuelClosedLoopPid_iFactor, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "D factor",								fuelClosedLoopPid_dFactor, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "min",									fuelClosedLoopPid_minValue, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "max",									fuelClosedLoopPid_maxValue, {fuelClosedLoopCorrectionEnabled == 1}
+	dialog = stftPartitioning, "Region Configuration"
+		field = "Idle region RPM",						stft_maxIdleRegionRpm
+		field = "Overrun region load",					stft_maxOverrunLoad
+		field = "Power region load",					stft_minPowerLoad
 
+	dialog = stftPartitionSettingsMain, "Main Region", xAxis
+		field = "Time Const",							stft_cellCfgs4_timeConstant
+		field = "Max add",								stft_cellCfgs4_maxAdd
+		field = "Max remove",							stft_cellCfgs4_maxRemove
+
+	dialog = stftPartitionSettingsIdle, "Idle Region", xAxis
+		field = "Time Const",							stft_cellCfgs1_timeConstant
+		field = "Max add",								stft_cellCfgs1_maxAdd
+		field = "Max remove",							stft_cellCfgs1_maxRemove
+
+	dialog = stftPartitionSettingsPower, "Power Region", xAxis
+		field = "Time Const",							stft_cellCfgs3_timeConstant
+		field = "Max add",								stft_cellCfgs3_maxAdd
+		field = "Max remove",							stft_cellCfgs3_maxRemove
+
+	dialog = stftPartitionSettingsOverrun, "Overrun Region", xAxis
+		field = "Time Const",							stft_cellCfgs2_timeConstant
+		field = "Max add",								stft_cellCfgs2_maxAdd
+		field = "Max remove",							stft_cellCfgs2_maxRemove
+
+	dialog = fuelClosedLoopDialog, "Short-term fuel trim"
+		field = "Enabled",								fuelClosedLoopCorrectionEnabled
+
+		field = "Startup delay"							stft_startupDelay, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Minimum CLT for correction",			stft_minClt, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Minimum AFR for correction",			stft_minAfr, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Maximum AFR for correction",			stft_maxAfr, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Adjustment deadband",					stft_deadband, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Ignore error magnitude",				stftIgnoreErrorMagnitude, {fuelClosedLoopCorrectionEnabled == 1}
+
+		panel = stftPartitioning, {fuelClosedLoopCorrectionEnabled == 1}
+		panel = stftPartitionSettingsMain, {fuelClosedLoopCorrectionEnabled == 1}
+		panel = stftPartitionSettingsIdle, {fuelClosedLoopCorrectionEnabled == 1}
+		panel = stftPartitionSettingsPower, {fuelClosedLoopCorrectionEnabled == 1}
+		panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1}
 
 	dialog = auxPidDialog, "Aux PID"
 		field = "Enabled",								activateAuxPid1
diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini
index eefdba9076..8878c1e01d 100644
--- a/firmware/tunerstudio/rusefi_frankenso.ini
+++ b/firmware/tunerstudio/rusefi_frankenso.ini
@@ -89,7 +89,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun May 31 13:45:24 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun May 31 17:00:20 EDT 2020
 
 pageSize            = 20000
 page = 1
@@ -1545,7 +1545,7 @@ page = 1
       iatCorrection   = scalar,  S16,     64,        "%",{1/100},         0
       cltCorrection   = scalar,  S16,     66,        "%",{1/100},         0
       baroCorrection  = scalar,  S16,     68,        "%",{1/100},         0
-      fuelPidCorrection=scalar,  S16,     70,     "ms",{1/300},         0
+      fuelPidCorrection=scalar,  S16,     70,       "ms",{1/100},         0
 
 ; Wall model AE
       wallFuelAmount  = scalar,  U16,     72,     "ms",{1/300},         0
@@ -2280,7 +2280,7 @@ gaugeCategory = Fueling
    injectorLagMsGauge = injectorLagMs,       "fuel: injector lag",      "mSec",        0,   25.5,     1.0,    1.2,      20,    25,   3, 1
    fuelRunningGauge     = fuelRunning,       "fuel: running",      "mSec",        0,   25.5,     1.0,    1.2,      20,    25,   3, 1
    baseFuelGauge     = baseFuel,       "fuel: base",      "mSec",        0,   25.5,     1.0,    1.2,      20,    25,   3, 1
-   fuelPidCorrectionGauge = fuelPidCorrection,       "fuel: Short-term closed loop correction",      "mSec",        -11,   11,     1.0,    1.2,      20,    25,   3, 1
+   fuelPidCorrectionGauge = fuelPidCorrection,       "fuel: Short-term fuel trim",      "%",        -10,   10,     -8, -5, 5, 8,   3, 1
 
 gaugeCategory = Throttle Body (incl. ETB)
    pedalPositionGauge = throttlePedalPosition, "Throttle pedal position",        "%",    0,    120,      0,     0,     100,   100,   1,   1
@@ -2413,7 +2413,7 @@ gaugeCategory = Sensors - Raw
    entry = fuelRunning,     "fuel: running", float,  "%.3f"
    entry = actualLastInjection,     "fuel: Last injection", float,  "%.3f"
    entry = baseFuel,	    "fuel: base",  float,  "%.2f"
-   entry = fuelPidCorrection,"fuel: Short-term closed loop correction",  float,  "%.2f"
+   entry = fuelPidCorrection,"fuel: Short-term fuel trim",  float,  "%.2f"
    entry = veValue,         "fuel: VE",    float,  "%.3f"
    entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f"
    entry = coilDutyCycle,	"dwell: coil duty cycle",	float,"%.3f"
@@ -2552,7 +2552,7 @@ menuDialog = main
 
 		# Targets & closed loop
 		subMenu = afrTableTbl,				"Target AFR", 0, {isInjectionEnabled == 1 && (fuelAlgorithm == LM_SPEED_DENSITY || fuelAlgorithm == LM_REAL_MAF)}
-		subMenu = fuelClosedLoopDialog, 	"Closed loop correction", 0, {isInjectionEnabled == 1}
+		subMenu = fuelClosedLoopDialog, 	"Closed loop fuel correction", 0, {isInjectionEnabled == 1}
 		subMenu = coastingFuelCutControl, 	"Deceleration fuel cutoff (DFCO)", 0, {isInjectionEnabled == 1}
 		subMenu = std_separator
 
@@ -3723,23 +3723,46 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "SPI3sck mode",							spi3SckMode, {is_enabled_spi_3 == 1}
 		field = "LIS302DLCsPin",						LIS302DLCsPin
 
-	dialog = fuelClosedLoopDialog, "Fuel short-term closed-loop correction"
-		field = "#This is just the cherry on the cake once you have good VE table"
-		field = "Enabled",								fuelClosedLoopCorrectionEnabled
-		field = "!No correction below these value"
-		field = "CLT - low threshod", 					fuelClosedLoopCltThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "RPM - low threshod", 					fuelClosedLoopRpmThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "EGO - low threshod", 					fuelClosedLoopAfrLowThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "!No correction above these value"
-		field = "TPS - high threshod", 					fuelClosedLoopTpsThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "EGO - high threshod", 					fuelClosedLoopAfrHighThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "!PID settings"
-		field = "P factor",								fuelClosedLoopPid_pFactor, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "I factor",								fuelClosedLoopPid_iFactor, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "D factor",								fuelClosedLoopPid_dFactor, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "min",									fuelClosedLoopPid_minValue, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "max",									fuelClosedLoopPid_maxValue, {fuelClosedLoopCorrectionEnabled == 1}
+	dialog = stftPartitioning, "Region Configuration"
+		field = "Idle region RPM",						stft_maxIdleRegionRpm
+		field = "Overrun region load",					stft_maxOverrunLoad
+		field = "Power region load",					stft_minPowerLoad
 
+	dialog = stftPartitionSettingsMain, "Main Region", xAxis
+		field = "Time Const",							stft_cellCfgs4_timeConstant
+		field = "Max add",								stft_cellCfgs4_maxAdd
+		field = "Max remove",							stft_cellCfgs4_maxRemove
+
+	dialog = stftPartitionSettingsIdle, "Idle Region", xAxis
+		field = "Time Const",							stft_cellCfgs1_timeConstant
+		field = "Max add",								stft_cellCfgs1_maxAdd
+		field = "Max remove",							stft_cellCfgs1_maxRemove
+
+	dialog = stftPartitionSettingsPower, "Power Region", xAxis
+		field = "Time Const",							stft_cellCfgs3_timeConstant
+		field = "Max add",								stft_cellCfgs3_maxAdd
+		field = "Max remove",							stft_cellCfgs3_maxRemove
+
+	dialog = stftPartitionSettingsOverrun, "Overrun Region", xAxis
+		field = "Time Const",							stft_cellCfgs2_timeConstant
+		field = "Max add",								stft_cellCfgs2_maxAdd
+		field = "Max remove",							stft_cellCfgs2_maxRemove
+
+	dialog = fuelClosedLoopDialog, "Short-term fuel trim"
+		field = "Enabled",								fuelClosedLoopCorrectionEnabled
+
+		field = "Startup delay"							stft_startupDelay, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Minimum CLT for correction",			stft_minClt, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Minimum AFR for correction",			stft_minAfr, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Maximum AFR for correction",			stft_maxAfr, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Adjustment deadband",					stft_deadband, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Ignore error magnitude",				stftIgnoreErrorMagnitude, {fuelClosedLoopCorrectionEnabled == 1}
+
+		panel = stftPartitioning, {fuelClosedLoopCorrectionEnabled == 1}
+		panel = stftPartitionSettingsMain, {fuelClosedLoopCorrectionEnabled == 1}
+		panel = stftPartitionSettingsIdle, {fuelClosedLoopCorrectionEnabled == 1}
+		panel = stftPartitionSettingsPower, {fuelClosedLoopCorrectionEnabled == 1}
+		panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1}
 
 	dialog = auxPidDialog, "Aux PID"
 		field = "Enabled",								activateAuxPid1
diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini
index c1e626c431..1a7d597beb 100644
--- a/firmware/tunerstudio/rusefi_kinetis.ini
+++ b/firmware/tunerstudio/rusefi_kinetis.ini
@@ -89,7 +89,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 kineris_gen_config.bat integration/rusefi_config.txt Sun May 31 13:45:27 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sun May 31 17:00:29 EDT 2020
 
 pageSize            = 20000
 page = 1
@@ -1545,7 +1545,7 @@ page = 1
       iatCorrection   = scalar,  S16,     64,        "%",{1/100},         0
       cltCorrection   = scalar,  S16,     66,        "%",{1/100},         0
       baroCorrection  = scalar,  S16,     68,        "%",{1/100},         0
-      fuelPidCorrection=scalar,  S16,     70,     "ms",{1/300},         0
+      fuelPidCorrection=scalar,  S16,     70,       "ms",{1/100},         0
 
 ; Wall model AE
       wallFuelAmount  = scalar,  U16,     72,     "ms",{1/300},         0
@@ -2280,7 +2280,7 @@ gaugeCategory = Fueling
    injectorLagMsGauge = injectorLagMs,       "fuel: injector lag",      "mSec",        0,   25.5,     1.0,    1.2,      20,    25,   3, 1
    fuelRunningGauge     = fuelRunning,       "fuel: running",      "mSec",        0,   25.5,     1.0,    1.2,      20,    25,   3, 1
    baseFuelGauge     = baseFuel,       "fuel: base",      "mSec",        0,   25.5,     1.0,    1.2,      20,    25,   3, 1
-   fuelPidCorrectionGauge = fuelPidCorrection,       "fuel: Short-term closed loop correction",      "mSec",        -11,   11,     1.0,    1.2,      20,    25,   3, 1
+   fuelPidCorrectionGauge = fuelPidCorrection,       "fuel: Short-term fuel trim",      "%",        -10,   10,     -8, -5, 5, 8,   3, 1
 
 gaugeCategory = Throttle Body (incl. ETB)
    pedalPositionGauge = throttlePedalPosition, "Throttle pedal position",        "%",    0,    120,      0,     0,     100,   100,   1,   1
@@ -2413,7 +2413,7 @@ gaugeCategory = Sensors - Raw
    entry = fuelRunning,     "fuel: running", float,  "%.3f"
    entry = actualLastInjection,     "fuel: Last injection", float,  "%.3f"
    entry = baseFuel,	    "fuel: base",  float,  "%.2f"
-   entry = fuelPidCorrection,"fuel: Short-term closed loop correction",  float,  "%.2f"
+   entry = fuelPidCorrection,"fuel: Short-term fuel trim",  float,  "%.2f"
    entry = veValue,         "fuel: VE",    float,  "%.3f"
    entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f"
    entry = coilDutyCycle,	"dwell: coil duty cycle",	float,"%.3f"
@@ -2552,7 +2552,7 @@ menuDialog = main
 
 		# Targets & closed loop
 		subMenu = afrTableTbl,				"Target AFR", 0, {isInjectionEnabled == 1 && (fuelAlgorithm == LM_SPEED_DENSITY || fuelAlgorithm == LM_REAL_MAF)}
-		subMenu = fuelClosedLoopDialog, 	"Closed loop correction", 0, {isInjectionEnabled == 1}
+		subMenu = fuelClosedLoopDialog, 	"Closed loop fuel correction", 0, {isInjectionEnabled == 1}
 		subMenu = coastingFuelCutControl, 	"Deceleration fuel cutoff (DFCO)", 0, {isInjectionEnabled == 1}
 		subMenu = std_separator
 
@@ -3724,23 +3724,46 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "SPI3sck mode",							spi3SckMode, {is_enabled_spi_3 == 1}
 		field = "LIS302DLCsPin",						LIS302DLCsPin
 
-	dialog = fuelClosedLoopDialog, "Fuel short-term closed-loop correction"
-		field = "#This is just the cherry on the cake once you have good VE table"
-		field = "Enabled",								fuelClosedLoopCorrectionEnabled
-		field = "!No correction below these value"
-		field = "CLT - low threshod", 					fuelClosedLoopCltThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "RPM - low threshod", 					fuelClosedLoopRpmThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "EGO - low threshod", 					fuelClosedLoopAfrLowThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "!No correction above these value"
-		field = "TPS - high threshod", 					fuelClosedLoopTpsThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "EGO - high threshod", 					fuelClosedLoopAfrHighThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "!PID settings"
-		field = "P factor",								fuelClosedLoopPid_pFactor, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "I factor",								fuelClosedLoopPid_iFactor, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "D factor",								fuelClosedLoopPid_dFactor, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "min",									fuelClosedLoopPid_minValue, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "max",									fuelClosedLoopPid_maxValue, {fuelClosedLoopCorrectionEnabled == 1}
+	dialog = stftPartitioning, "Region Configuration"
+		field = "Idle region RPM",						stft_maxIdleRegionRpm
+		field = "Overrun region load",					stft_maxOverrunLoad
+		field = "Power region load",					stft_minPowerLoad
 
+	dialog = stftPartitionSettingsMain, "Main Region", xAxis
+		field = "Time Const",							stft_cellCfgs4_timeConstant
+		field = "Max add",								stft_cellCfgs4_maxAdd
+		field = "Max remove",							stft_cellCfgs4_maxRemove
+
+	dialog = stftPartitionSettingsIdle, "Idle Region", xAxis
+		field = "Time Const",							stft_cellCfgs1_timeConstant
+		field = "Max add",								stft_cellCfgs1_maxAdd
+		field = "Max remove",							stft_cellCfgs1_maxRemove
+
+	dialog = stftPartitionSettingsPower, "Power Region", xAxis
+		field = "Time Const",							stft_cellCfgs3_timeConstant
+		field = "Max add",								stft_cellCfgs3_maxAdd
+		field = "Max remove",							stft_cellCfgs3_maxRemove
+
+	dialog = stftPartitionSettingsOverrun, "Overrun Region", xAxis
+		field = "Time Const",							stft_cellCfgs2_timeConstant
+		field = "Max add",								stft_cellCfgs2_maxAdd
+		field = "Max remove",							stft_cellCfgs2_maxRemove
+
+	dialog = fuelClosedLoopDialog, "Short-term fuel trim"
+		field = "Enabled",								fuelClosedLoopCorrectionEnabled
+
+		field = "Startup delay"							stft_startupDelay, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Minimum CLT for correction",			stft_minClt, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Minimum AFR for correction",			stft_minAfr, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Maximum AFR for correction",			stft_maxAfr, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Adjustment deadband",					stft_deadband, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Ignore error magnitude",				stftIgnoreErrorMagnitude, {fuelClosedLoopCorrectionEnabled == 1}
+
+		panel = stftPartitioning, {fuelClosedLoopCorrectionEnabled == 1}
+		panel = stftPartitionSettingsMain, {fuelClosedLoopCorrectionEnabled == 1}
+		panel = stftPartitionSettingsIdle, {fuelClosedLoopCorrectionEnabled == 1}
+		panel = stftPartitionSettingsPower, {fuelClosedLoopCorrectionEnabled == 1}
+		panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1}
 
 	dialog = auxPidDialog, "Aux PID"
 		field = "Enabled",								activateAuxPid1
diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini
index 025ddf58ea..f0b0e70e0f 100644
--- a/firmware/tunerstudio/rusefi_microrusefi.ini
+++ b/firmware/tunerstudio/rusefi_microrusefi.ini
@@ -89,7 +89,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun May 31 13:45:23 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun May 31 17:00:17 EDT 2020
 
 pageSize            = 20000
 page = 1
@@ -1545,7 +1545,7 @@ page = 1
       iatCorrection   = scalar,  S16,     64,        "%",{1/100},         0
       cltCorrection   = scalar,  S16,     66,        "%",{1/100},         0
       baroCorrection  = scalar,  S16,     68,        "%",{1/100},         0
-      fuelPidCorrection=scalar,  S16,     70,     "ms",{1/300},         0
+      fuelPidCorrection=scalar,  S16,     70,       "ms",{1/100},         0
 
 ; Wall model AE
       wallFuelAmount  = scalar,  U16,     72,     "ms",{1/300},         0
@@ -2280,7 +2280,7 @@ gaugeCategory = Fueling
    injectorLagMsGauge = injectorLagMs,       "fuel: injector lag",      "mSec",        0,   25.5,     1.0,    1.2,      20,    25,   3, 1
    fuelRunningGauge     = fuelRunning,       "fuel: running",      "mSec",        0,   25.5,     1.0,    1.2,      20,    25,   3, 1
    baseFuelGauge     = baseFuel,       "fuel: base",      "mSec",        0,   25.5,     1.0,    1.2,      20,    25,   3, 1
-   fuelPidCorrectionGauge = fuelPidCorrection,       "fuel: Short-term closed loop correction",      "mSec",        -11,   11,     1.0,    1.2,      20,    25,   3, 1
+   fuelPidCorrectionGauge = fuelPidCorrection,       "fuel: Short-term fuel trim",      "%",        -10,   10,     -8, -5, 5, 8,   3, 1
 
 gaugeCategory = Throttle Body (incl. ETB)
    pedalPositionGauge = throttlePedalPosition, "Throttle pedal position",        "%",    0,    120,      0,     0,     100,   100,   1,   1
@@ -2413,7 +2413,7 @@ gaugeCategory = Sensors - Raw
    entry = fuelRunning,     "fuel: running", float,  "%.3f"
    entry = actualLastInjection,     "fuel: Last injection", float,  "%.3f"
    entry = baseFuel,	    "fuel: base",  float,  "%.2f"
-   entry = fuelPidCorrection,"fuel: Short-term closed loop correction",  float,  "%.2f"
+   entry = fuelPidCorrection,"fuel: Short-term fuel trim",  float,  "%.2f"
    entry = veValue,         "fuel: VE",    float,  "%.3f"
    entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f"
    entry = coilDutyCycle,	"dwell: coil duty cycle",	float,"%.3f"
@@ -2552,7 +2552,7 @@ menuDialog = main
 
 		# Targets & closed loop
 		subMenu = afrTableTbl,				"Target AFR", 0, {isInjectionEnabled == 1 && (fuelAlgorithm == LM_SPEED_DENSITY || fuelAlgorithm == LM_REAL_MAF)}
-		subMenu = fuelClosedLoopDialog, 	"Closed loop correction", 0, {isInjectionEnabled == 1}
+		subMenu = fuelClosedLoopDialog, 	"Closed loop fuel correction", 0, {isInjectionEnabled == 1}
 		subMenu = coastingFuelCutControl, 	"Deceleration fuel cutoff (DFCO)", 0, {isInjectionEnabled == 1}
 		subMenu = std_separator
 
@@ -3702,23 +3702,46 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "SPI3sck mode",							spi3SckMode, {is_enabled_spi_3 == 1}
 		field = "LIS302DLCsPin",						LIS302DLCsPin
 
-	dialog = fuelClosedLoopDialog, "Fuel short-term closed-loop correction"
-		field = "#This is just the cherry on the cake once you have good VE table"
-		field = "Enabled",								fuelClosedLoopCorrectionEnabled
-		field = "!No correction below these value"
-		field = "CLT - low threshod", 					fuelClosedLoopCltThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "RPM - low threshod", 					fuelClosedLoopRpmThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "EGO - low threshod", 					fuelClosedLoopAfrLowThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "!No correction above these value"
-		field = "TPS - high threshod", 					fuelClosedLoopTpsThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "EGO - high threshod", 					fuelClosedLoopAfrHighThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "!PID settings"
-		field = "P factor",								fuelClosedLoopPid_pFactor, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "I factor",								fuelClosedLoopPid_iFactor, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "D factor",								fuelClosedLoopPid_dFactor, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "min",									fuelClosedLoopPid_minValue, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "max",									fuelClosedLoopPid_maxValue, {fuelClosedLoopCorrectionEnabled == 1}
+	dialog = stftPartitioning, "Region Configuration"
+		field = "Idle region RPM",						stft_maxIdleRegionRpm
+		field = "Overrun region load",					stft_maxOverrunLoad
+		field = "Power region load",					stft_minPowerLoad
 
+	dialog = stftPartitionSettingsMain, "Main Region", xAxis
+		field = "Time Const",							stft_cellCfgs4_timeConstant
+		field = "Max add",								stft_cellCfgs4_maxAdd
+		field = "Max remove",							stft_cellCfgs4_maxRemove
+
+	dialog = stftPartitionSettingsIdle, "Idle Region", xAxis
+		field = "Time Const",							stft_cellCfgs1_timeConstant
+		field = "Max add",								stft_cellCfgs1_maxAdd
+		field = "Max remove",							stft_cellCfgs1_maxRemove
+
+	dialog = stftPartitionSettingsPower, "Power Region", xAxis
+		field = "Time Const",							stft_cellCfgs3_timeConstant
+		field = "Max add",								stft_cellCfgs3_maxAdd
+		field = "Max remove",							stft_cellCfgs3_maxRemove
+
+	dialog = stftPartitionSettingsOverrun, "Overrun Region", xAxis
+		field = "Time Const",							stft_cellCfgs2_timeConstant
+		field = "Max add",								stft_cellCfgs2_maxAdd
+		field = "Max remove",							stft_cellCfgs2_maxRemove
+
+	dialog = fuelClosedLoopDialog, "Short-term fuel trim"
+		field = "Enabled",								fuelClosedLoopCorrectionEnabled
+
+		field = "Startup delay"							stft_startupDelay, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Minimum CLT for correction",			stft_minClt, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Minimum AFR for correction",			stft_minAfr, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Maximum AFR for correction",			stft_maxAfr, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Adjustment deadband",					stft_deadband, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Ignore error magnitude",				stftIgnoreErrorMagnitude, {fuelClosedLoopCorrectionEnabled == 1}
+
+		panel = stftPartitioning, {fuelClosedLoopCorrectionEnabled == 1}
+		panel = stftPartitionSettingsMain, {fuelClosedLoopCorrectionEnabled == 1}
+		panel = stftPartitionSettingsIdle, {fuelClosedLoopCorrectionEnabled == 1}
+		panel = stftPartitionSettingsPower, {fuelClosedLoopCorrectionEnabled == 1}
+		panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1}
 
 	dialog = auxPidDialog, "Aux PID"
 		field = "Enabled",								activateAuxPid1
diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini
index 22146970d4..b8bed618d6 100644
--- a/firmware/tunerstudio/rusefi_prometheus.ini
+++ b/firmware/tunerstudio/rusefi_prometheus.ini
@@ -89,7 +89,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun May 31 13:45:25 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun May 31 17:00:22 EDT 2020
 
 pageSize            = 20000
 page = 1
@@ -1545,7 +1545,7 @@ page = 1
       iatCorrection   = scalar,  S16,     64,        "%",{1/100},         0
       cltCorrection   = scalar,  S16,     66,        "%",{1/100},         0
       baroCorrection  = scalar,  S16,     68,        "%",{1/100},         0
-      fuelPidCorrection=scalar,  S16,     70,     "ms",{1/300},         0
+      fuelPidCorrection=scalar,  S16,     70,       "ms",{1/100},         0
 
 ; Wall model AE
       wallFuelAmount  = scalar,  U16,     72,     "ms",{1/300},         0
@@ -2280,7 +2280,7 @@ gaugeCategory = Fueling
    injectorLagMsGauge = injectorLagMs,       "fuel: injector lag",      "mSec",        0,   25.5,     1.0,    1.2,      20,    25,   3, 1
    fuelRunningGauge     = fuelRunning,       "fuel: running",      "mSec",        0,   25.5,     1.0,    1.2,      20,    25,   3, 1
    baseFuelGauge     = baseFuel,       "fuel: base",      "mSec",        0,   25.5,     1.0,    1.2,      20,    25,   3, 1
-   fuelPidCorrectionGauge = fuelPidCorrection,       "fuel: Short-term closed loop correction",      "mSec",        -11,   11,     1.0,    1.2,      20,    25,   3, 1
+   fuelPidCorrectionGauge = fuelPidCorrection,       "fuel: Short-term fuel trim",      "%",        -10,   10,     -8, -5, 5, 8,   3, 1
 
 gaugeCategory = Throttle Body (incl. ETB)
    pedalPositionGauge = throttlePedalPosition, "Throttle pedal position",        "%",    0,    120,      0,     0,     100,   100,   1,   1
@@ -2413,7 +2413,7 @@ gaugeCategory = Sensors - Raw
    entry = fuelRunning,     "fuel: running", float,  "%.3f"
    entry = actualLastInjection,     "fuel: Last injection", float,  "%.3f"
    entry = baseFuel,	    "fuel: base",  float,  "%.2f"
-   entry = fuelPidCorrection,"fuel: Short-term closed loop correction",  float,  "%.2f"
+   entry = fuelPidCorrection,"fuel: Short-term fuel trim",  float,  "%.2f"
    entry = veValue,         "fuel: VE",    float,  "%.3f"
    entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f"
    entry = coilDutyCycle,	"dwell: coil duty cycle",	float,"%.3f"
@@ -2552,7 +2552,7 @@ menuDialog = main
 
 		# Targets & closed loop
 		subMenu = afrTableTbl,				"Target AFR", 0, {isInjectionEnabled == 1 && (fuelAlgorithm == LM_SPEED_DENSITY || fuelAlgorithm == LM_REAL_MAF)}
-		subMenu = fuelClosedLoopDialog, 	"Closed loop correction", 0, {isInjectionEnabled == 1}
+		subMenu = fuelClosedLoopDialog, 	"Closed loop fuel correction", 0, {isInjectionEnabled == 1}
 		subMenu = coastingFuelCutControl, 	"Deceleration fuel cutoff (DFCO)", 0, {isInjectionEnabled == 1}
 		subMenu = std_separator
 
@@ -3719,23 +3719,46 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "SPI3sck mode",							spi3SckMode, {is_enabled_spi_3 == 1}
 		field = "LIS302DLCsPin",						LIS302DLCsPin
 
-	dialog = fuelClosedLoopDialog, "Fuel short-term closed-loop correction"
-		field = "#This is just the cherry on the cake once you have good VE table"
-		field = "Enabled",								fuelClosedLoopCorrectionEnabled
-		field = "!No correction below these value"
-		field = "CLT - low threshod", 					fuelClosedLoopCltThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "RPM - low threshod", 					fuelClosedLoopRpmThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "EGO - low threshod", 					fuelClosedLoopAfrLowThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "!No correction above these value"
-		field = "TPS - high threshod", 					fuelClosedLoopTpsThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "EGO - high threshod", 					fuelClosedLoopAfrHighThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "!PID settings"
-		field = "P factor",								fuelClosedLoopPid_pFactor, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "I factor",								fuelClosedLoopPid_iFactor, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "D factor",								fuelClosedLoopPid_dFactor, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "min",									fuelClosedLoopPid_minValue, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "max",									fuelClosedLoopPid_maxValue, {fuelClosedLoopCorrectionEnabled == 1}
+	dialog = stftPartitioning, "Region Configuration"
+		field = "Idle region RPM",						stft_maxIdleRegionRpm
+		field = "Overrun region load",					stft_maxOverrunLoad
+		field = "Power region load",					stft_minPowerLoad
 
+	dialog = stftPartitionSettingsMain, "Main Region", xAxis
+		field = "Time Const",							stft_cellCfgs4_timeConstant
+		field = "Max add",								stft_cellCfgs4_maxAdd
+		field = "Max remove",							stft_cellCfgs4_maxRemove
+
+	dialog = stftPartitionSettingsIdle, "Idle Region", xAxis
+		field = "Time Const",							stft_cellCfgs1_timeConstant
+		field = "Max add",								stft_cellCfgs1_maxAdd
+		field = "Max remove",							stft_cellCfgs1_maxRemove
+
+	dialog = stftPartitionSettingsPower, "Power Region", xAxis
+		field = "Time Const",							stft_cellCfgs3_timeConstant
+		field = "Max add",								stft_cellCfgs3_maxAdd
+		field = "Max remove",							stft_cellCfgs3_maxRemove
+
+	dialog = stftPartitionSettingsOverrun, "Overrun Region", xAxis
+		field = "Time Const",							stft_cellCfgs2_timeConstant
+		field = "Max add",								stft_cellCfgs2_maxAdd
+		field = "Max remove",							stft_cellCfgs2_maxRemove
+
+	dialog = fuelClosedLoopDialog, "Short-term fuel trim"
+		field = "Enabled",								fuelClosedLoopCorrectionEnabled
+
+		field = "Startup delay"							stft_startupDelay, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Minimum CLT for correction",			stft_minClt, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Minimum AFR for correction",			stft_minAfr, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Maximum AFR for correction",			stft_maxAfr, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Adjustment deadband",					stft_deadband, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Ignore error magnitude",				stftIgnoreErrorMagnitude, {fuelClosedLoopCorrectionEnabled == 1}
+
+		panel = stftPartitioning, {fuelClosedLoopCorrectionEnabled == 1}
+		panel = stftPartitionSettingsMain, {fuelClosedLoopCorrectionEnabled == 1}
+		panel = stftPartitionSettingsIdle, {fuelClosedLoopCorrectionEnabled == 1}
+		panel = stftPartitionSettingsPower, {fuelClosedLoopCorrectionEnabled == 1}
+		panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1}
 
 	dialog = auxPidDialog, "Aux PID"
 		field = "Enabled",								activateAuxPid1
diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini
index 9221f0316a..fd116d5cd6 100644
--- a/firmware/tunerstudio/rusefi_proteus.ini
+++ b/firmware/tunerstudio/rusefi_proteus.ini
@@ -89,7 +89,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun May 31 13:45:26 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun May 31 17:00:24 EDT 2020
 
 pageSize            = 20000
 page = 1
@@ -1545,7 +1545,7 @@ page = 1
       iatCorrection   = scalar,  S16,     64,        "%",{1/100},         0
       cltCorrection   = scalar,  S16,     66,        "%",{1/100},         0
       baroCorrection  = scalar,  S16,     68,        "%",{1/100},         0
-      fuelPidCorrection=scalar,  S16,     70,     "ms",{1/300},         0
+      fuelPidCorrection=scalar,  S16,     70,       "ms",{1/100},         0
 
 ; Wall model AE
       wallFuelAmount  = scalar,  U16,     72,     "ms",{1/300},         0
@@ -2280,7 +2280,7 @@ gaugeCategory = Fueling
    injectorLagMsGauge = injectorLagMs,       "fuel: injector lag",      "mSec",        0,   25.5,     1.0,    1.2,      20,    25,   3, 1
    fuelRunningGauge     = fuelRunning,       "fuel: running",      "mSec",        0,   25.5,     1.0,    1.2,      20,    25,   3, 1
    baseFuelGauge     = baseFuel,       "fuel: base",      "mSec",        0,   25.5,     1.0,    1.2,      20,    25,   3, 1
-   fuelPidCorrectionGauge = fuelPidCorrection,       "fuel: Short-term closed loop correction",      "mSec",        -11,   11,     1.0,    1.2,      20,    25,   3, 1
+   fuelPidCorrectionGauge = fuelPidCorrection,       "fuel: Short-term fuel trim",      "%",        -10,   10,     -8, -5, 5, 8,   3, 1
 
 gaugeCategory = Throttle Body (incl. ETB)
    pedalPositionGauge = throttlePedalPosition, "Throttle pedal position",        "%",    0,    120,      0,     0,     100,   100,   1,   1
@@ -2413,7 +2413,7 @@ gaugeCategory = Sensors - Raw
    entry = fuelRunning,     "fuel: running", float,  "%.3f"
    entry = actualLastInjection,     "fuel: Last injection", float,  "%.3f"
    entry = baseFuel,	    "fuel: base",  float,  "%.2f"
-   entry = fuelPidCorrection,"fuel: Short-term closed loop correction",  float,  "%.2f"
+   entry = fuelPidCorrection,"fuel: Short-term fuel trim",  float,  "%.2f"
    entry = veValue,         "fuel: VE",    float,  "%.3f"
    entry = injectorDutyCycle,"fuel: injector duty cycle",float,"%.3f"
    entry = coilDutyCycle,	"dwell: coil duty cycle",	float,"%.3f"
@@ -2552,7 +2552,7 @@ menuDialog = main
 
 		# Targets & closed loop
 		subMenu = afrTableTbl,				"Target AFR", 0, {isInjectionEnabled == 1 && (fuelAlgorithm == LM_SPEED_DENSITY || fuelAlgorithm == LM_REAL_MAF)}
-		subMenu = fuelClosedLoopDialog, 	"Closed loop correction", 0, {isInjectionEnabled == 1}
+		subMenu = fuelClosedLoopDialog, 	"Closed loop fuel correction", 0, {isInjectionEnabled == 1}
 		subMenu = coastingFuelCutControl, 	"Deceleration fuel cutoff (DFCO)", 0, {isInjectionEnabled == 1}
 		subMenu = std_separator
 
@@ -3698,23 +3698,46 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "SPI3sck mode",							spi3SckMode, {is_enabled_spi_3 == 1}
 		field = "LIS302DLCsPin",						LIS302DLCsPin
 
-	dialog = fuelClosedLoopDialog, "Fuel short-term closed-loop correction"
-		field = "#This is just the cherry on the cake once you have good VE table"
-		field = "Enabled",								fuelClosedLoopCorrectionEnabled
-		field = "!No correction below these value"
-		field = "CLT - low threshod", 					fuelClosedLoopCltThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "RPM - low threshod", 					fuelClosedLoopRpmThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "EGO - low threshod", 					fuelClosedLoopAfrLowThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "!No correction above these value"
-		field = "TPS - high threshod", 					fuelClosedLoopTpsThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "EGO - high threshod", 					fuelClosedLoopAfrHighThreshold, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "!PID settings"
-		field = "P factor",								fuelClosedLoopPid_pFactor, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "I factor",								fuelClosedLoopPid_iFactor, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "D factor",								fuelClosedLoopPid_dFactor, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "min",									fuelClosedLoopPid_minValue, {fuelClosedLoopCorrectionEnabled == 1}
-		field = "max",									fuelClosedLoopPid_maxValue, {fuelClosedLoopCorrectionEnabled == 1}
+	dialog = stftPartitioning, "Region Configuration"
+		field = "Idle region RPM",						stft_maxIdleRegionRpm
+		field = "Overrun region load",					stft_maxOverrunLoad
+		field = "Power region load",					stft_minPowerLoad
 
+	dialog = stftPartitionSettingsMain, "Main Region", xAxis
+		field = "Time Const",							stft_cellCfgs4_timeConstant
+		field = "Max add",								stft_cellCfgs4_maxAdd
+		field = "Max remove",							stft_cellCfgs4_maxRemove
+
+	dialog = stftPartitionSettingsIdle, "Idle Region", xAxis
+		field = "Time Const",							stft_cellCfgs1_timeConstant
+		field = "Max add",								stft_cellCfgs1_maxAdd
+		field = "Max remove",							stft_cellCfgs1_maxRemove
+
+	dialog = stftPartitionSettingsPower, "Power Region", xAxis
+		field = "Time Const",							stft_cellCfgs3_timeConstant
+		field = "Max add",								stft_cellCfgs3_maxAdd
+		field = "Max remove",							stft_cellCfgs3_maxRemove
+
+	dialog = stftPartitionSettingsOverrun, "Overrun Region", xAxis
+		field = "Time Const",							stft_cellCfgs2_timeConstant
+		field = "Max add",								stft_cellCfgs2_maxAdd
+		field = "Max remove",							stft_cellCfgs2_maxRemove
+
+	dialog = fuelClosedLoopDialog, "Short-term fuel trim"
+		field = "Enabled",								fuelClosedLoopCorrectionEnabled
+
+		field = "Startup delay"							stft_startupDelay, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Minimum CLT for correction",			stft_minClt, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Minimum AFR for correction",			stft_minAfr, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Maximum AFR for correction",			stft_maxAfr, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Adjustment deadband",					stft_deadband, {fuelClosedLoopCorrectionEnabled == 1}
+		field = "Ignore error magnitude",				stftIgnoreErrorMagnitude, {fuelClosedLoopCorrectionEnabled == 1}
+
+		panel = stftPartitioning, {fuelClosedLoopCorrectionEnabled == 1}
+		panel = stftPartitionSettingsMain, {fuelClosedLoopCorrectionEnabled == 1}
+		panel = stftPartitionSettingsIdle, {fuelClosedLoopCorrectionEnabled == 1}
+		panel = stftPartitionSettingsPower, {fuelClosedLoopCorrectionEnabled == 1}
+		panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1}
 
 	dialog = auxPidDialog, "Aux PID"
 		field = "Enabled",								activateAuxPid1
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 979b582eb3..25c890415a 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 gen_config.bat integration\rusefi_config.txt Sun May 31 14:04:20 EDT 2020
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun May 31 17:00:13 EDT 2020
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
@@ -564,7 +564,7 @@ public class Fields {
 	public static final String GAUGE_NAME_FUEL_IAT_CORR = "fuel: IAT correction";
 	public static final String GAUGE_NAME_FUEL_INJ_DUTY = "fuel: injector duty cycle";
 	public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last injection";
-	public static final String GAUGE_NAME_FUEL_PID_CORR = "fuel: Short-term closed loop correction";
+	public static final String GAUGE_NAME_FUEL_PID_CORR = "fuel: Short-term fuel trim";
 	public static final String GAUGE_NAME_FUEL_RUNNING = "fuel: running";
 	public static final String GAUGE_NAME_FUEL_TPS_EXTRA = "fuel: TPS acceleration extra fuel ms";
 	public static final String GAUGE_NAME_FUEL_TPS_ROC = "fuel: TPS change";