diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index e8094af344..011100ffbd 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -473,7 +473,7 @@ bit hasMapSensor;@see isMapAveragingEnabled
 
 	float cylinderBore;Cylinder diameter, in mm.
 
-float idleStepperReactionTime;
+float idleStepperReactionTime;;"ms",      1,      0,       0, 300,      0
 	float hipThreshold;
 
 custom pin_input_mode_e 4 scalar, F32,	@OFFSET@,	"ms", 1, 0, 0, 200, 1	
@@ -483,7 +483,7 @@ custom pin_input_mode_e 4 scalar, F32,	@OFFSET@,	"ms", 1, 0, 0, 200, 1
 	float alternatorControlPFactor;
 	float alternatorControlIFactor;
 	float alternatorControlDFactor;
-	int idleStepperTotalSteps;
+	int idleStepperTotalSteps;;"count",      1,      0,       0, 3000,      0
 	int[136] unused3;
 
 	int tpsAccelLength;;"len",        1,     0,    1, 200,     3
diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini
index e5f3cbe5fb..001cff755f 100644
--- a/firmware/tunerstudio/rusefi.ini
+++ b/firmware/tunerstudio/rusefi.ini
@@ -40,7 +40,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated by ConfigDefinition.jar on Tue Apr 14 19:23:50 EDT 2015
+; this section was generated by ConfigDefinition.jar on Tue Apr 14 21:10:17 EDT 2015
 
 pageSize            = 15288
 page = 1
@@ -428,7 +428,7 @@ page = 1
 ;skipping knockDetectionWindowStart offset 1536
 ;skipping knockDetectionWindowEnd offset 1540
 ;skipping cylinderBore offset 1544
-;skipping idleStepperReactionTime offset 1548
+	idleStepperReactionTime			= scalar, F32,	1548,	"ms", 1, 0, 0, 300, 0
 ;skipping hipThreshold offset 1552
 	fsioInputModes1				 = scalar, F32, 1556, "ms", 1, 0, 0, 200, 1
 	fsioInputModes2				 = scalar, F32, 1560, "ms", 1, 0, 0, 200, 1
@@ -450,7 +450,7 @@ page = 1
 ;skipping alternatorControlPFactor offset 1624
 ;skipping alternatorControlIFactor offset 1628
 ;skipping alternatorControlDFactor offset 1632
-;skipping idleStepperTotalSteps offset 1636
+	idleStepperTotalSteps			= scalar, S32,	1636,	"count", 1, 0, 0, 3000, 0
 ;skipping unused3 offset 1640
 	tpsAccelLength					= scalar, S32,	2184,	"len", 1, 0, 1, 200, 3
 	tpsAccelEnrichmentThreshold		= scalar, F32,	2188,	"roc", 1, 0, 0, 200, 3
@@ -639,7 +639,7 @@ fileVersion = { 20150406 }
       yBins       = sparkDwell
       gauge       = rpm
     
-   curve = map_samplingAngleCurve, "MAP Sampling Angle"
+   curve = map_samplingAngleCurve, "MAP Sampling Start Angle"
       columnLabel = "RPM", "Angle"
       xAxis       =  0, 8000, 10
       yAxis       =  0,  180, 10
@@ -647,7 +647,7 @@ fileVersion = { 20150406 }
       yBins       = map_samplingAngle
       gauge       = rpm
    
-   curve = map_samplingWindowCurve, "MAP Sampling Window"
+   curve = map_samplingWindowCurve, "MAP Sampling Duration"
       columnLabel = "RPM", "Window"
       xAxis       =  0, 8000, 10
       yAxis       =  0,  180, 10
@@ -690,7 +690,7 @@ fileVersion = { 20150406 }
 	curve = crankingFuelCurve, "Cranking Coolant Temp correction"
       columnLabel = "Coolant", "Correction"
       xAxis       =  -40, 120, 10
-      yAxis       =  0,  1000, 10
+      yAxis       =  0,  5, 10
       xBins       = crankingFuelBins, coolant
       yBins       = crankingFuelCoef
       gauge       = CLTGauge
@@ -698,10 +698,20 @@ fileVersion = { 20150406 }
 	curve = crankingDurationCurve, "Cranking Duration correction"
       columnLabel = "Engine Cycle", "Correction"
       xAxis       =  0, 1000, 10
-      yAxis       =  0,  1000, 10
+      yAxis       =  0,  5, 10
       xBins       = crankingCycleBins
       yBins       = crankingCycleCoef
 
+
+	curve = cltIdleCurve, "CLT idle correction"
+      columnLabel = "Coolant", "Correction"
+      xAxis       = -40, 120, 10
+      yAxis       =  0,  5, 10
+      xBins       = cltIdleCorrBins, coolant
+      yBins       = cltIdleCorr
+      gauge       = CLTGauge
+
+
 [TableEditor]
    ;       table_id,    map3d_id,    "title",      page
    table = fuelTableTbl,  fuelTableMap,  "Fuel Table",   1
@@ -896,6 +906,7 @@ fileVersion = { 20150406 }
 		subMenu = egoSettings,				"EGO Sensor Settings"
 		subMenu = std_separator
 		subMenu = fanSetting,				"Fan Settings"
+		subMenu = idleSettings,				"Idle Settings"
 	
 	menu = "Tuning"
 		subMenu = generalSettings,			"General"
@@ -1042,9 +1053,27 @@ fileVersion = { 20150406 }
 		panel = map_samplingWindowCurve,	East
 		
 	dialog = mapSettings, "MAP Sensor Settings", border
-		panel = mapSensor,				South
 		panel = mapCurves,				North
+		panel = mapSensor,				South
+
+	dialog = idleSettings2, "Settings"
+		field = "Idle Position",					idlePosition
+		field = "use stepper",						useStepperIdle
+		field = ""
+		field = "Idle Solenoid Pin Mode",   	  	    idle_solenoidPinMode, !useStepperIdle
+		field = "Idle Solenoid Pin",					idle_solenoidPin, !useStepperIdle
+		field = "Idle Solenoid Frequency",   			idle_solenoidFrequency, !useStepperIdle
+		field = ""
+		field = "Idle Stepper Step",					idle_stepperStepPin, useStepperIdle
+		field = "Idle Stepper Dir",						idle_stepperDirectionPin, useStepperIdle
+		field = "Stepper reaction time",				idleStepperReactionTime, useStepperIdle
+		field = "Stepper total steps",					idleStepperTotalSteps, useStepperIdle
 		
+	dialog = idleSettings, "Idle Settings"
+		panel = idleSettings2,				North
+		panel = cltIdleCurve,				South
+
+
 ;			Engine->EGO Sensor Settings
 	dialog = egoSettings, "EGO Sensor Settings"
 		field = "low voltage", 							afr_v1
@@ -1147,13 +1176,6 @@ fileVersion = { 20150406 }
 		field = "Fuel Pump Pin Mode",         	        fuelPumpPinMode
 		field = "Fuel Pump Pin",						fuelPumpPin
 		field = ""
-		field = "Idle Position",						idlePosition
-		field = "Idle Valve Pin Mode",   	  	        idle_solenoidPinMode
-		field = "Idle Valve Pin",						idle_solenoidPin
-		field = "Idle Frequency",   					idle_solenoidFrequency
-		field = "Idle Stepper Step",					idle_stepperStepPin
-		field = "Idle Stepper Dir",						idle_stepperDirectionPin
-		field = ""
 		field = "Fan Pin Mode",							fanPinMode
 		field = "Fan Pin",								fanPin
 		field = ""