diff --git a/firmware/controllers/generated/engine_state_generated.h b/firmware/controllers/generated/engine_state_generated.h
index acdbb2a599..d8ce16c561 100644
--- a/firmware/controllers/generated/engine_state_generated.h
+++ b/firmware/controllers/generated/engine_state_generated.h
@@ -1,4 +1,4 @@
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/engine_state.txt Sun Jul 21 16:50:42 EDT 2019
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/engine_state.txt Sun Jul 21 18:03:23 EDT 2019
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #ifndef CONTROLLERS_GENERATED_ENGINE_STATE_GENERATED_H
@@ -35,31 +35,6 @@ struct pid_state_s {
 
 typedef struct pid_state_s pid_state_s;
 
-// start of idle_state_s
-struct idle_state_s {
-	/**
-	 * offset 0
-	 */
-	idle_state_e idleState = (idle_state_e)0;
-	/**
-	 * that's current position with CLT and IAT corrections
-	 * offset 4
-	 */
-	percent_t currentIdlePosition = (percent_t)0;
-	/**
-	 * current position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)
-	 * offset 8
-	 */
-	percent_t baseIdlePosition = (percent_t)0;
-	/**
-	 * offset 12
-	 */
-	int throttleUpState = (int)0;
-	/** total size 16*/
-};
-
-typedef struct idle_state_s idle_state_s;
-
 // start of speed_density_s
 struct speed_density_s {
 	/**
@@ -101,6 +76,31 @@ struct speed_density_s {
 
 typedef struct speed_density_s speed_density_s;
 
+// start of idle_state_s
+struct idle_state_s {
+	/**
+	 * offset 0
+	 */
+	idle_state_e idleState = (idle_state_e)0;
+	/**
+	 * that's current position with CLT and IAT corrections
+	 * offset 4
+	 */
+	percent_t currentIdlePosition = (percent_t)0;
+	/**
+	 * current position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)
+	 * offset 8
+	 */
+	percent_t baseIdlePosition = (percent_t)0;
+	/**
+	 * offset 12
+	 */
+	int throttleUpState = (int)0;
+	/** total size 16*/
+};
+
+typedef struct idle_state_s idle_state_s;
+
 // start of engine_state2_s
 struct engine_state2_s {
 	/**
@@ -146,4 +146,4 @@ typedef struct engine_state2_s engine_state2_s;
 
 #endif
 // end
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/engine_state.txt Sun Jul 21 16:50:42 EDT 2019
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/engine_state.txt Sun Jul 21 18:03:23 EDT 2019
diff --git a/firmware/integration/engine_state.txt b/firmware/integration/engine_state.txt
index 1a70ca098e..1684cfa589 100644
--- a/firmware/integration/engine_state.txt
+++ b/firmware/integration/engine_state.txt
@@ -8,14 +8,6 @@ struct_no_prefix pid_state_s
 	
 
 
-end_struct
-
-struct_no_prefix idle_state_s
-	idle_state_e idleState
-	percent_t currentIdlePosition;that's current position with CLT and IAT corrections
-	percent_t baseIdlePosition;current position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)
-	int throttleUpState	
-
 end_struct
 
 struct_no_prefix engine_state2_s
@@ -44,6 +36,14 @@ end_struct
 speed_density_s sd;
 
 
+struct_no_prefix idle_state_s
+	idle_state_e idleState
+	percent_t currentIdlePosition;that's current position with CLT and IAT corrections
+	percent_t baseIdlePosition;current position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)
+	int throttleUpState	
+
+end_struct
+
 idle_state_s idle;
 
 	float targetAFR
diff --git a/java_console/models/src/com/rusefi/config/generated/EngineState.java b/java_console/models/src/com/rusefi/config/generated/EngineState.java
index ececc9f73a..a15767e32e 100644
--- a/java_console/models/src/com/rusefi/config/generated/EngineState.java
+++ b/java_console/models/src/com/rusefi/config/generated/EngineState.java
@@ -1,6 +1,6 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/engine_state.txt Sun Jul 21 16:50:42 EDT 2019
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/engine_state.txt Sun Jul 21 18:03:23 EDT 2019
 
 // by class com.rusefi.output.JavaFieldsConsumer
 import com.rusefi.config.*;
@@ -11,10 +11,6 @@ public class EngineState {
 	public static final Field TARGET = Field.create("TARGET", 8, FieldType.FLOAT);
 	public static final Field INPUT = Field.create("INPUT", 12, FieldType.FLOAT);
 	public static final Field OUTPUT = Field.create("OUTPUT", 16, FieldType.FLOAT);
-	public static final Field IDLESTATE = Field.create("IDLESTATE", 0, FieldType.INT);
-	public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT);
-	public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT);
-	public static final Field THROTTLEUPSTATE = Field.create("THROTTLEUPSTATE", 12, FieldType.INT);
 	public static final Field ISTCHARGEAIRMODEL = Field.create("ISTCHARGEAIRMODEL", 0, FieldType.BIT, 0);
 	public static final Field AIRMASSINONECYLINDER = Field.create("AIRMASSINONECYLINDER", 4, FieldType.FLOAT);
 	public static final Field TCHARGE = Field.create("TCHARGE", 8, FieldType.FLOAT);
@@ -40,10 +36,6 @@ public class EngineState {
 	TARGET,
 	INPUT,
 	OUTPUT,
-	IDLESTATE,
-	CURRENTIDLEPOSITION,
-	BASEIDLEPOSITION,
-	THROTTLEUPSTATE,
 	ISTCHARGEAIRMODEL,
 	AIRMASSINONECYLINDER,
 	TCHARGE,