diff --git a/app/gui/oven_control/define.h b/app/gui/oven_control/define.h
index 599e69d..9775dc7 100644
--- a/app/gui/oven_control/define.h
+++ b/app/gui/oven_control/define.h
@@ -5,14 +5,14 @@
 
 #define MAJOR_VER   2
 #define MINOR_VER   0
-#define HOTFIX_VER  6
+#define HOTFIX_VER  7
 
 // 0 for normal
 // 1 for premium
-#define MODEL_GRADE 1
+#define MODEL_GRADE 0
 
 #define ENABLE_WASH_RESUMING 0
-#define WATER_LEVEL_HACCP_STAMP 1
+#define WATER_LEVEL_HACCP_STAMP 0
 
 namespace Define
 {
diff --git a/app/gui/oven_control/ovenstatics.cpp b/app/gui/oven_control/ovenstatics.cpp
index 59e9d92..8b9aed3 100644
--- a/app/gui/oven_control/ovenstatics.cpp
+++ b/app/gui/oven_control/ovenstatics.cpp
@@ -134,9 +134,9 @@ void OvenStatistics::processSensorError(uint16_t errflag, time_t ltime){
     uint8_t state;
     bool bCookingState = (control.cooking || oven->cooking() || oven->preheating() || oven->cooldown());
     if( control.system==0 && !bCookingState  ) state = SYS_OFF_COOK_OFF;
-    else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF;
-    else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON;
     else if(control.system !=0 && this->state.cleaning_sate  !=0 ) state = SYS_ON_WASH;
+    else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF;
+    else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON;    
     else state = SYS_ON_COOK_OFF;
 
     if(errflag & MAKE_MASK(SENSOR_ERR_SENSOR_1)){
@@ -211,9 +211,9 @@ void OvenStatistics::processCommError(uint16_t errflag, time_t ltime){
     uint8_t state;
     bool bCookingState = (control.cooking || oven->cooking() || oven->preheating() || oven->cooldown());
     if( control.system==0 && !bCookingState  ) state = SYS_OFF_COOK_OFF;
-    else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF;
-    else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON;
     else if(control.system !=0 && this->state.cleaning_sate  !=0 ) state = SYS_ON_WASH;
+    else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF;
+    else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON;    
     else state = SYS_ON_COOK_OFF;
 
     if(errflag & MAKE_MASK(COMM_ERR_BUNNER1)){
@@ -254,9 +254,9 @@ void OvenStatistics::processStateError(uint16_t errflag, time_t ltime){
     uint8_t state;
     bool bCookingState = (control.cooking || oven->cooking() || oven->preheating() || oven->cooldown());
     if( control.system==0 && !bCookingState  ) state = SYS_OFF_COOK_OFF;
+    else if(control.system !=0 && this->state.cleaning_sate  !=0 ) state = SYS_ON_WASH;
     else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF;
     else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON;
-    else if(control.system !=0 && this->state.cleaning_sate  !=0 ) state = SYS_ON_WASH;
     else state = SYS_ON_COOK_OFF;
 
     if(errflag & MAKE_MASK(STATE_ERR_BUNNER1)){
@@ -297,9 +297,9 @@ void OvenStatistics::processSystemError(uint16_t errflag,time_t ltime){
     uint8_t state;
     bool bCookingState = (control.cooking || oven->cooking() || oven->preheating() || oven->cooldown());
     if( control.system==0 && !bCookingState  ) state = SYS_OFF_COOK_OFF;
-    else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF;
-    else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON;
     else if(control.system !=0 && this->state.cleaning_sate  !=0 ) state = SYS_ON_WASH;
+    else if(control.system != 0 && !bCookingState) state = SYS_ON_COOK_OFF;
+    else if(control.system !=0 && bCookingState) state = SYS_ON_COOK_ON;    
     else state = SYS_ON_COOK_OFF;
 
     if( errflag & MAKE_MASK(SYS_ERR_FIRE_TRIGGER1)){