diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml
index b67603fe..07e27033 100644
--- a/xml/page_topping_select8.xml
+++ b/xml/page_topping_select8.xml
@@ -2346,18 +2346,12 @@
 		EndIf
 		
 			
-		If UserSeletedSugar = 0 Then 
+		If UserSeletedSugar = 0 Then
+
 			If SugarModeUpdateWhenChangeDrinkType = 1 Then
 				Var SugarModeUpdateWhenChangeDrinkType = 0
 				RefreshAll
 			Else
-				Var SugarState1 = "Enable"
-				Var SugarState2 = "Enable"
-				Var SugarState3 = "Enable"
-				Var SugarState4 = "Enable"
-				Var SugarState5 = "Enable"
-				Var SugarState6 = "Enable"
-
 				Var CustomSweetState[0] = "Enable"
 				Var CustomSweetState[1] = "Enable"
 				Var CustomSweetState[2] = "Enable"
@@ -2367,53 +2361,57 @@
 			EndIf
 
 			Var sugar_default_flag = 0
-			
+
 			; Suger 4 step cold
 			If TOPPING1 = "Suger 4 step cold" Then
-				
-				
+				Var SugarZeroCalOption = "Enable"
+
 				Var BGSugar = "Invisible"
 
 				Var ShiftSugarStep = 1
-				Var SugarState1 = "Enable"
-				Var SugarState2 = "Enable"
-				Var SugarState3 = "Enable"
-				Var SugarState4 = "Enable"
-
 				Var CustomSweetState[0] = "Enable"
 				Var CustomSweetState[1] = "Enable"
 				Var CustomSweetState[2] = "Enable"
 				Var CustomSweetState[3] = "Enable"
 
-
 				If toppingID1index1 = toppingID1Default Then
-					Var SugarState1 = "PressForever"
 					Var CustomSweetState[0] = "PressForever"
 					Var sugar_default_flag = 1
 					; select no sugar
 					Var SugarZeroCalCheck = "Disable"
 				EndIf
-				
+
 				If toppingID1index2 = toppingID1Default Then
-					Var SugarState2 = "PressForever"
 					Var CustomSweetState[1] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
-				
+
 				If toppingID1index3 = toppingID1Default Then
-					Var SugarState3 = "PressForever"
 					Var CustomSweetState[2] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
 
 				If toppingID1index4 = toppingID1Default Then
-					Var SugarState4 = "PressForever"
 					Var CustomSweetState[3] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
 
+
+
+
+
+				; No 2 right steps
+				;If NoSugarStepRight2 = "true" Then
+
+				;	Var CustomSweetState[4] = "Disable"
+				;	Var CustomSweetState[5] = "Disable"
+
+				;EndIf
+
+
+
+
 				If sugar_default_flag = 0 Then
-					Var SugarState1 = "PressForever"
 					Var CustomSweetState[0] = "PressForever"
 					; select no sugar
 					Var SugarZeroCalCheck = "Disable"
@@ -2423,208 +2421,175 @@
 			; Suger 4 step hot
 			If TOPPING1 = "Suger 4 step hot" Then
 				Var SugarZeroCalOption = "Enable"
-				
+
+
 				Var BGSugar = "Invisible"
 
 				Var ShiftSugarStep = 1
-				Var SugarState1 = "Enable"
-				Var SugarState2 = "Enable"
-				Var SugarState3 = "Enable"
-				Var SugarState4 = "Enable"
-
 				Var CustomSweetState[0] = "Enable"
 				Var CustomSweetState[1] = "Enable"
 				Var CustomSweetState[2] = "Enable"
 				Var CustomSweetState[3] = "Enable"
-		
 
 				If toppingID1index1 = toppingID1Default Then
-					Var SugarState1 = "PressForever"
 					Var CustomSweetState[0] = "PressForever"
 					Var sugar_default_flag = 1
 					; select no sugar
 					Var SugarZeroCalCheck = "Disable"
 				EndIf
-				
+
 				If toppingID1index2 = toppingID1Default Then
-					Var SugarState2 = "PressForever"
 					Var CustomSweetState[1] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
-				
+
 				If toppingID1index3 = toppingID1Default Then
-					Var SugarState3 = "PressForever"
 					Var CustomSweetState[2] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
 
 				If toppingID1index4 = toppingID1Default Then
-					Var SugarState4 = "PressForever"
 					Var CustomSweetState[3] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
 
+				; No 2 right steps
+				;If NoSugarStepRight2 = "true" Then
+
+				;	Var CustomSweetState[4] = "Disable"
+				;	Var CustomSweetState[5] = "Disable"
+
+				;EndIf
+
 				If sugar_default_flag = 0 Then
-					Var SugarState1 = "PressForever"
 					Var CustomSweetState[0] = "PressForever"
-						; select no sugar
+					; select no sugar
 					Var SugarZeroCalCheck = "Disable"
 				EndIf
 			EndIf
 
 			DEBUGVAR RecipeTag2
-			; 
+			;
 			If TOPPING1 = "Sugar" Then
 				Var SugarZeroCalOption = "Enable"
 
-				
 				If RecipeTag2 = "Topping6Step" Then
 					Var BGSugar = "Invisible"
 					Var BGSugarNew = "Enable"
 				Else
 					Var BGSugar = "Enable"
 				EndIf
-				
-				Var ShiftSugarStep = 1
-				Var SugarState1 = "Enable"
-				Var SugarState2 = "Enable"
-				Var SugarState3 = "Enable"
-				Var SugarState4 = "Enable"
-				Var SugarState5 = "Enable"
 
+				Var ShiftSugarStep = 1
 				Var CustomSweetState[0] = "Enable"
 				Var CustomSweetState[1] = "Enable"
 				Var CustomSweetState[2] = "Enable"
 				Var CustomSweetState[3] = "Enable"
 				Var CustomSweetState[4] = "Enable"
-			
 
 				If toppingID1index1 = toppingID1Default Then
-					Var SugarState1 = "PressForever"
 					Var CustomSweetState[0] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
-				
+
 				If toppingID1index2 = toppingID1Default Then
-					Var SugarState2 = "PressForever"
 					Var CustomSweetState[1] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
-				
+
 				If toppingID1index3 = toppingID1Default Then
-					Var SugarState3 = "PressForever"
 					Var CustomSweetState[2] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
 
 				If toppingID1index4 = toppingID1Default Then
-					Var SugarState4 = "PressForever"
 					Var CustomSweetState[3] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
 
 				If toppingID1index5 = toppingID1Default Then
-					Var SugarState5 = "PressForever"
 					Var CustomSweetState[4] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
+
 				; No 2 right steps
 				If NoSugarStepRight2 = "true" Then
 
 					If RecipeTag2 = "Topping6Step" Then
-						Var SugarState5 = "Disable"
-						Var SugarState6 = "Disable"
 						Var CustomSweetState[4] = "Disable"
 						Var CustomSweetState[5] = "Disable"
 					Else
-						Var SugarState5 = "Disable"
-						Var CustomSweetState[6] = "Disable"
+						Var CustomSweetState[4] = "Disable"
 					EndIf
 
 				EndIf
 
 				If sugar_default_flag = 0 Then
-					Var SugarState1 = "PressForever"
 					Var CustomSweetState[0] = "PressForever"
 				EndIf
-				
+
 			EndIf
 
 			If TOPPING1 = "Powder Sugar for Hot" Then
 				Var SugarZeroCalOption = "Enable"
-				
+
 				If RecipeTag2 = "Topping6Step" Then
 					Var BGSugar = "Invisible"
 					Var BGSugarNew = "Enable"
 				Else
 					Var BGSugar = "Enable"
 				EndIf
-				
-				Var ShiftSugarStep = 1
-				Var SugarState1 = "Enable"
-				Var SugarState2 = "Enable"
-				Var SugarState3 = "Enable"
-				Var SugarState4 = "Enable"
-				Var SugarState5 = "Enable"
 
+				Var ShiftSugarStep = 1
 				Var CustomSweetState[0] = "Enable"
 				Var CustomSweetState[1] = "Enable"
 				Var CustomSweetState[2] = "Enable"
 				Var CustomSweetState[3] = "Enable"
 				Var CustomSweetState[4] = "Enable"
-				
 
 				If toppingID1index1 = toppingID1Default Then
-					Var SugarState1 = "PressForever"
 					Var CustomSweetState[0] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
-				
+
 				If toppingID1index2 = toppingID1Default Then
-					Var SugarState2 = "PressForever"
 					Var CustomSweetState[1] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
-				
+
 				If toppingID1index3 = toppingID1Default Then
-					Var SugarState3 = "PressForever"
 					Var CustomSweetState[2] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
 
 				If toppingID1index4 = toppingID1Default Then
-					Var SugarState4 = "PressForever"
 					Var CustomSweetState[3] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
 
 				If toppingID1index5 = toppingID1Default Then
-					Var SugarState5 = "PressForever"
 					Var CustomSweetState[4] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
+
 				; No 2 right steps
 				If NoSugarStepRight2 = "true" Then
 
 					If RecipeTag2 = "Topping6Step" Then
-						Var SugarState5 = "Disable"
-						Var SugarState6 = "Disable"
 						Var CustomSweetState[4] = "Disable"
 						Var CustomSweetState[5] = "Disable"
 					Else
-						Var SugarState5 = "Disable"
 						Var CustomSweetState[4] = "Disable"
 					EndIf
 
 				EndIf
 
 				If sugar_default_flag = 0 Then
-					Var SugarState1 = "PressForever"
 					Var CustomSweetState[0] = "PressForever"
 				EndIf
-				
+
 			EndIf
-			
+
 			If TOPPING1 = "Powder Sugar" Then
 				Var SugarZeroCalOption = "Enable"
 
@@ -2634,15 +2599,8 @@
 				Else
 					Var BGSugar = "Enable"
 				EndIf
-				
-				Var ShiftSugarStep = 1
-				Var SugarState1 = "Enable"
-				Var SugarState2 = "Enable"
-				Var SugarState3 = "Enable"
-				Var SugarState4 = "Enable"
-				Var SugarState5 = "Enable"
-				Var SugarState6 = "Enable"
 
+				Var ShiftSugarStep = 1
 				Var CustomSweetState[0] = "Enable"
 				Var CustomSweetState[1] = "Enable"
 				Var CustomSweetState[2] = "Enable"
@@ -2653,123 +2611,102 @@
 				DEBUGVAR "set default Powder Sugar"
 
 				If toppingID1index1 = toppingID1Default Then
-					Var SugarState1 = "PressForever"
 					Var CustomSweetState[0] = "PressForever"
 					Var sugar_default_flag = 1
-					Var SugarZeroCalCheck = "Disable"
 				EndIf
-				
+
 				If toppingID1index2 = toppingID1Default Then
-					Var SugarState2 = "PressForever"
 					Var CustomSweetState[1] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
-				
+
 				If toppingID1index3 = toppingID1Default Then
-					Var SugarState3 = "PressForever"
 					Var CustomSweetState[2] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
 
 				If toppingID1index4 = toppingID1Default Then
-					Var SugarState4 = "PressForever"
 					Var CustomSweetState[3] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
 
 				If toppingID1index5 = toppingID1Default Then
-					Var SugarState5 = "PressForever"
 					Var CustomSweetState[4] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
 
+
 				; No 2 right steps
 				If NoSugarStepRight2 = "true" Then
 
 					If RecipeTag2 = "Topping6Step" Then
-						Var SugarState5 = "Disable"
-						Var SugarState6 = "Disable"
 						Var CustomSweetState[4] = "Disable"
 						Var CustomSweetState[5] = "Disable"
 					Else
-						Var SugarState5 = "Disable"
 						Var CustomSweetState[4] = "Disable"
 					EndIf
 
 				EndIf
 
 				If sugar_default_flag = 0 Then
-					Var SugarState1 = "PressForever"
 					Var CustomSweetState[0] = "PressForever"
-					Var SugarZeroCalCheck = "Disable"
 				EndIf
 
 				DEBUGVAR toppingID1Default
-				DEBUGVAR SugarState1
+				DEBUGVAR CustomSweetState[0]
 			EndIf
-			
+
 
 			If TOPPING1 = "Sugar Premix 25" Then
 				Var SugarZeroCalOption = "Enable"
+
 				If RecipeTag2 = "Topping6Step" Then
 					Var BGSugar = "Invisible"
 					Var BGSugarNew = "Enable"
 				Else
 					Var BGSugar = "Enable"
 				EndIf
-				
+
 				Var ShiftSugarStep = 2
-				Var SugarState1 = "Disable"
-				Var SugarState2 = "Enable"
-
-				Var SugarState3 = "Enable"
-				Var SugarState4 = "Enable"
-				Var SugarState5 = "Enable"
-				Var SugarState6 = "Enable"
-
 				Var CustomSweetState[0] = "Disable"
 				Var CustomSweetState[1] = "Enable"
+
 				Var CustomSweetState[2] = "Enable"
 				Var CustomSweetState[3] = "Enable"
 				Var CustomSweetState[4] = "Enable"
 				Var CustomSweetState[5] = "Enable"
-				
+
 				If toppingID1index1 = toppingID1Default Then
-					Var SugarState2 = "PressForever"
 					Var CustomSweetState[1] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
-				
+
 				If toppingID1index2 = toppingID1Default Then
-					Var SugarState3 = "PressForever"
 					Var CustomSweetState[2] = "PressForever"
 					Var sugar_default_flag = 1
+					; select no sugar
+					Var SugarZeroCalCheck = "Disable"
 				EndIf
 
 				If toppingID1index3 = toppingID1Default Then
-					Var SugarState4 = "PressForever"
 					Var CustomSweetState[3] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
 
 				If toppingID1index4 = toppingID1Default Then
-					Var SugarState5 = "PressForever"
 					Var CustomSweetState[4] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
-				
+
 				; No 2 right steps
 				If NoSugarStepRight2 = "true" Then
 
-					Var SugarState5 = "Disable"
-					Var SugarState6 = "Disable"
 					Var CustomSweetState[4] = "Disable"
 					Var CustomSweetState[5] = "Disable"
 
 				EndIf
 
 				If sugar_default_flag = 0 Then
-					Var SugarState2 = "PressForever"
 					Var CustomSweetState[1] = "PressForever"
 				EndIf
 
@@ -2777,6 +2714,7 @@
 
 			If TOPPING1 = "Powder Sugar Premix 50" Then
 				Var SugarZeroCalOption = "Enable"
+
 				If RecipeTag2 = "Topping6Step" Then
 					Var BGSugar = "Invisible"
 					Var BGSugarNew = "Enable"
@@ -2784,35 +2722,23 @@
 					Var BGSugar = "Enable"
 				EndIf
 				Var ShiftSugarStep = 3
-				Var SugarState1 = "Disable"
-				Var SugarState2 = "Disable"
-				If RecipeTag2 = "Topping6Step" Then
-					Var SugarState3 = "Disable"
-					Var CustomSweetState[2] = "Disable"
-				Else
-					Var SugarState3 = "Enable"
-					Var CustomSweetState[2] = "Enable"
-				EndIf
-				Var SugarState4 = "Enable"
-				Var SugarState5 = "Enable"
-				Var SugarState6 = "Enable"
-
 				Var CustomSweetState[0] = "Disable"
 				Var CustomSweetState[1] = "Disable"
-				
-
+				If RecipeTag2 = "Topping6Step" Then
+					Var CustomSweetState[2] = "Disable"
+				Else
+					Var CustomSweetState[2] = "Enable"
+				EndIf
 				Var CustomSweetState[3] = "Enable"
 				Var CustomSweetState[4] = "Enable"
 				Var CustomSweetState[5] = "Enable"
-				
+
 				If toppingID1index1 = toppingID1Default Then
-					Var SugarState3 = "PressForever"
 					Var CustomSweetState[2] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
 
 				If toppingID1index2 = toppingID1Default Then
-					Var SugarState4 = "PressForever"
 					Var CustomSweetState[3] = "PressForever"
 					Var sugar_default_flag = 1
 					; select no sugar
@@ -2824,7 +2750,6 @@
 				EndIf
 
 				If toppingID1index3 = toppingID1Default Then
-					Var SugarState5 = "PressForever"
 					Var CustomSweetState[4] = "PressForever"
 					Var sugar_default_flag = 1
 					If SugarZeroCalCheck = "Disable2" Then
@@ -2838,19 +2763,15 @@
 				If NoSugarStepRight2 = "true" Then
 
 					If RecipeTag2 = "Topping6Step" Then
-						Var SugarState5 = "Disable"
-						Var SugarState6 = "Disable"
 						Var CustomSweetState[4] = "Disable"
 						Var CustomSweetState[5] = "Disable"
 					Else
-						Var SugarState5 = "Disable"
 						Var CustomSweetState[4] = "Disable"
 					EndIf
 
 				EndIf
 
 				If sugar_default_flag = 0 Then
-					Var SugarState3 = "PressForever"
 					Var CustomSweetState[2] = "PressForever"
 				EndIf
 
@@ -2858,6 +2779,7 @@
 
 			If TOPPING1 = "Powder Sugar Premix 25" Then
 				Var SugarZeroCalOption = "Enable"
+
 				If RecipeTag2 = "Topping6Step" Then
 					Var BGSugar = "Invisible"
 					Var BGSugarNew = "Enable"
@@ -2866,27 +2788,19 @@
 				EndIf
 
 				Var ShiftSugarStep = 2
-				
-				Var SugarState2 = "Enable"
-				Var SugarState3 = "Enable"
-				Var SugarState4 = "Enable"
-				Var SugarState5 = "Enable"
-
 
 				Var CustomSweetState[1] = "Enable"
+
 				Var CustomSweetState[2] = "Enable"
 				Var CustomSweetState[3] = "Enable"
 				Var CustomSweetState[4] = "Enable"
 
-				
 				If toppingID1index1 = toppingID1Default Then
-					Var SugarState2 = "PressForever"
 					Var CustomSweetState[1] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
-				
+
 				If toppingID1index2 = toppingID1Default Then
-					Var SugarState3 = "PressForever"
 					Var CustomSweetState[2] = "PressForever"
 					Var sugar_default_flag = 1
 					; select no sugar
@@ -2894,31 +2808,29 @@
 				EndIf
 
 				If toppingID1index3 = toppingID1Default Then
-					Var SugarState4 = "PressForever"
 					Var CustomSweetState[3] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
 
 				If toppingID1index4 = toppingID1Default Then
-					Var SugarState5 = "PressForever"
 					Var CustomSweetState[4] = "PressForever"
 					Var sugar_default_flag = 1
 				EndIf
+
 				; No 2 right steps
 				If NoSugarStepRight2 = "true" Then
 
 
 					If RecipeTag2 = "Topping6Step" Then
-						Var SugarState5 = "Disable"
-						Var SugarState6 = "Disable"
+						Var CustomSweetState[4] = "Disable"
+						Var CustomSweetState[5] = "Disable"
 					Else
-						Var SugarState5 = "Disable"
+						Var CustomSweetState[4] = "Disable"
 					EndIf
 
 				EndIf
-				
+
 				If sugar_default_flag = 0 Then
-					Var SugarState2 = "PressForever"
 					Var CustomSweetState[1] = "PressForever"
 				EndIf
 			EndIf
@@ -2926,22 +2838,26 @@
 			Var SugarModeUpdateWhenChangeDrinkType = 0
 
 			If TOPPING1 = "Suger 4 step cold" Then
+
 				Var BGSugarColdHealthy = "Enable"
 				Var BGSugarHotHealthy = "Invisible"
 
 				Var ShiftSugarStep = 1
 				Var SugarModeUpdateWhenChangeDrinkType = 1
+
 				If MAT_ID_1215 = "Disable" Then
 					Var SugarZeroCalCheck = "Disable2"
 				EndIf
 			EndIf
-		
+
 			If TOPPING1 = "Suger 4 step hot" Then
+
 				Var BGSugarHotHealthy = "Enable"
 				Var BGSugarColdHealthy = "Invisible"
 
 				Var ShiftSugarStep = 1
 				Var SugarModeUpdateWhenChangeDrinkType = 1
+
 				If MAT_ID_1215 = "Disable" Then
 					Var SugarZeroCalCheck = "Disable2"
 				EndIf
@@ -2972,17 +2888,18 @@
 				Var SugarZeroCalOption = "Invisible"
 			EndIf
 
-		
+
+
 
 			Var ShowCollagenOnly = "Enable"
 
 			Var BugFlag = 1
-			
+
 			Var topping1 = toppingID1Default
 
 
 			Var ToppingGotoPayment = "false"
-			
+
 			Var SugarSoundFlag = 0
 			If BGSugarNew = "Enable" Then
 				Var SugarSoundFlag = 1
@@ -3015,21 +2932,16 @@
 			DEBUGVAR SelectDrinkType
 
 			If SelectDrinkType = 0 Then
-				Var SugarState1 = "Enable"
-				Var SugarState2 = "Enable"
-				Var SugarState3 = "Enable"
-				Var SugarState4 = "Enable"
-				Var SugarState5 = "Enable"
-
 				Var CustomSweetState[0] = "Enable"
 				Var CustomSweetState[1] = "Enable"
 				Var CustomSweetState[2] = "Enable"
 				Var CustomSweetState[3] = "Enable"
 				Var CustomSweetState[4] = "Enable"
 			EndIf
-		
+
 		Else
 
+
 		EndIf 
 		; End of UserSeletedSugar = 0 
 
@@ -3966,8 +3878,17 @@
 				Var CustomSweetState[4] = "Enable"
 				Var CustomSweetState[5] = "Enable"
 
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					Var CustomSweetState[4] = "Disable"
+					Var CustomSweetState[5] = "Disable"
+
+				EndIf
+
 				Var topping1 = toppingID1index1
 			EndIf
+			Var SugarZeroCalOption = "Invisible"
 			Var UserSeletedSugar = 1
 
 
@@ -4003,6 +3924,15 @@
 					Var CustomSweetState[3] = "Enable"
 					Var CustomSweetState[4] = "Enable"
 					Var CustomSweetState[5] = "Enable"
+
+					; No 2 right steps
+					If NoSugarStepRight2 = "true" Then
+
+						Var CustomSweetState[4] = "Disable"
+						Var CustomSweetState[5] = "Disable"
+
+					EndIf
+
 					Var topping1 = toppingID1index2
 				EndIf
 				If ShiftSugarStep = 2 Then
@@ -4011,9 +3941,20 @@
 					Var CustomSweetState[3] = "Enable"
 					Var CustomSweetState[4] = "Enable"
 					Var CustomSweetState[5] = "Enable"
+
+					; No 2 right steps
+					If NoSugarStepRight2 = "true" Then
+
+						Var CustomSweetState[4] = "Disable"
+						Var CustomSweetState[5] = "Disable"
+
+					EndIf
 					Var topping1 = toppingID1index1
 				EndIf
 
+				Var SugarZeroCalCheck = "Enable"
+				Var SugarNormalCheck = "PressForever"
+
 				Var UserSeletedSugar = 1
 			EndIf
 
@@ -4048,33 +3989,45 @@
 				Var CustomSweetState[4] = "Enable"
 				Var CustomSweetState[5] = "Enable"
 
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					Var CustomSweetState[4] = "Disable"
+					Var CustomSweetState[5] = "Disable"
+
+				EndIf
+
 				Var topping1 = toppingID1index3
 			EndIf
 
 			If ShiftSugarStep = 2 Then
 				Var CustomSweetState[1] = "Enable"
+
 				Var CustomSweetState[2] = "PressForever"
 				Var CustomSweetState[3] = "Enable"
 				Var CustomSweetState[4] = "Enable"
 				Var CustomSweetState[5] = "Enable"
+
+
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					Var CustomSweetState[4] = "Disable"
+					Var CustomSweetState[5] = "Disable"
+
+				EndIf
+
 				Var topping1 = toppingID1index2
 			EndIf
 
-			If ShiftSugarStep = 3 Then
-
-				Var CustomSweetState[2] = "PressForever"
-				Var CustomSweetState[3] = "Enable"
-				Var CustomSweetState[4] = "Enable"
-				Var topping1 = toppingID1index1
-
-			EndIf
-
-
+			Var SugarZeroCalCheck = "Enable"
+			Var SugarNormalCheck = "PressForever"
 			Var UserSeletedSugar = 1
 		EndIf
 
-			Refresh
-		</EventClick>
+		DEBUGVAR topping1
+		Refresh
+	</EventClick>
 	</Button>
 
 	; sugar4
@@ -4088,7 +4041,6 @@
 		<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 		<Volume> SoundVolume </Volume>
 		<EventClick>
-
 			SAVELOG "SUGAR4"
 
 			If SelectDrinkType = 0 Then
@@ -4097,37 +4049,67 @@
 			Else
 
 				If ShiftSugarStep = 1 Then
-
 					Var CustomSweetState[0] = "Enable"
 					Var CustomSweetState[1] = "Enable"
 					Var CustomSweetState[2] = "Enable"
 					Var CustomSweetState[3] = "PressForever"
 					Var CustomSweetState[4] = "Enable"
 					Var CustomSweetState[5] = "Enable"
+
+					; No 2 right steps
+					If NoSugarStepRight2 = "true" Then
+
+						Var CustomSweetState[4] = "Disable"
+						Var CustomSweetState[5] = "Disable"
+
+					EndIf
+
 					Var topping1 = toppingID1index4
 				EndIf
 
 				If ShiftSugarStep = 2 Then
 					Var CustomSweetState[1] = "Enable"
+
 					Var CustomSweetState[2] = "Enable"
 					Var CustomSweetState[3] = "PressForever"
 					Var CustomSweetState[4] = "Enable"
+					Var CustomSweetState[5] = "Enable"
+
+					; No 2 right steps
+					If NoSugarStepRight2 = "true" Then
+
+						Var CustomSweetState[4] = "Disable"
+						Var CustomSweetState[5] = "Disable"
+
+					EndIf
+
 					Var topping1 = toppingID1index3
 				EndIf
 
 				If ShiftSugarStep = 3 Then
-					Var CustomSweetState[2] = "Enable"
+
 					Var CustomSweetState[3] = "PressForever"
 					Var CustomSweetState[4] = "Enable"
+					Var CustomSweetState[5] = "Enable"
+
+					; No 2 right steps
+					If NoSugarStepRight2 = "true" Then
+
+						Var CustomSweetState[4] = "Disable"
+						Var CustomSweetState[5] = "Disable"
+
+					EndIf
+
 					Var topping1 = toppingID1index2
 				EndIf
 
+				Var SugarZeroCalCheck = "Enable"
+				Var SugarNormalCheck = "PressForever"
 				Var UserSeletedSugar = 1
 			EndIf
 
-
+			DEBUGVAR topping1
 			Refresh
-
 		</EventClick>
 	</Button>
 
@@ -4148,37 +4130,69 @@
 				SAVELOG "drink type popup"
 				Var high_light_drink_type = "Enable"
 			Else
-				If ShiftSugarStep = 1 Then
 
+				If ShiftSugarStep = 1 Then
 					Var CustomSweetState[0] = "Enable"
 					Var CustomSweetState[1] = "Enable"
 					Var CustomSweetState[2] = "Enable"
 					Var CustomSweetState[3] = "Enable"
 					Var CustomSweetState[4] = "PressForever"
+					Var CustomSweetState[5] = "Enable"
+
+					; No 2 right steps
+					If NoSugarStepRight2 = "true" Then
+
+						Var CustomSweetState[4] = "Disable"
+						Var CustomSweetState[5] = "Disable"
+
+					EndIf
+
 					Var topping1 = toppingID1index5
 				EndIf
 
 				If ShiftSugarStep = 2 Then
 					Var CustomSweetState[1] = "Enable"
+
 					Var CustomSweetState[2] = "Enable"
 					Var CustomSweetState[3] = "Enable"
 					Var CustomSweetState[4] = "PressForever"
+					Var CustomSweetState[5] = "Enable"
+
+					; No 2 right steps
+					If NoSugarStepRight2 = "true" Then
+
+						Var CustomSweetState[4] = "Disable"
+						Var CustomSweetState[5] = "Disable"
+
+					EndIf
+
 					Var topping1 = toppingID1index4
 				EndIf
 
 				If ShiftSugarStep = 3 Then
-					Var CustomSweetState[2] = "Enable"
+
 					Var CustomSweetState[3] = "Enable"
 					Var CustomSweetState[4] = "PressForever"
+					Var CustomSweetState[5] = "Enable"
+
+					; No 2 right steps
+					If NoSugarStepRight2 = "true" Then
+
+						Var CustomSweetState[4] = "Disable"
+						Var CustomSweetState[5] = "Disable"
+
+					EndIf
+
 					Var topping1 = toppingID1index3
 				EndIf
 
+				Var SugarZeroCalCheck = "Enable"
+				Var SugarNormalCheck = "PressForever"
 				Var UserSeletedSugar = 1
 			EndIf
 
-	
+			DEBUGVAR topping1
 			Refresh
-
 		</EventClick>
 	</Button>
 
@@ -4201,35 +4215,67 @@
 			Else
 
 				If ShiftSugarStep = 1 Then
-
 					Var CustomSweetState[0] = "Enable"
 					Var CustomSweetState[1] = "Enable"
 					Var CustomSweetState[2] = "Enable"
 					Var CustomSweetState[3] = "Enable"
 					Var CustomSweetState[4] = "Enable"
 					Var CustomSweetState[5] = "PressForever"
+
+					; No 2 right steps
+					If NoSugarStepRight2 = "true" Then
+
+						Var CustomSweetState[4] = "Disable"
+						Var CustomSweetState[5] = "Disable"
+
+					EndIf
+
 					Var topping1 = toppingID1index6
 				EndIf
 
 				If ShiftSugarStep = 2 Then
+					Var CustomSweetState[1] = "Enable"
+
 					Var CustomSweetState[2] = "Enable"
 					Var CustomSweetState[3] = "Enable"
 					Var CustomSweetState[4] = "Enable"
 					Var CustomSweetState[5] = "PressForever"
+
+					; No 2 right steps
+					If NoSugarStepRight2 = "true" Then
+
+						Var CustomSweetState[4] = "Disable"
+						Var CustomSweetState[5] = "Disable"
+
+					EndIf
+
 					Var topping1 = toppingID1index5
 				EndIf
 
 				If ShiftSugarStep = 3 Then
+
 					Var CustomSweetState[3] = "Enable"
 					Var CustomSweetState[4] = "Enable"
 					Var CustomSweetState[5] = "PressForever"
+
+					; No 2 right steps
+					If NoSugarStepRight2 = "true" Then
+
+						Var CustomSweetState[4] = "Disable"
+						Var CustomSweetState[5] = "Disable"
+
+					EndIf
+
 					Var topping1 = toppingID1index4
 				EndIf
 
+				Var SugarZeroCalCheck = "Enable"
+				Var SugarNormalCheck = "PressForever"
 				Var UserSeletedSugar = 1
 			EndIf
-			Refresh
 
+			DEBUGVAR topping1
+			Refresh
 		</EventClick>
 	</Button>
 
@@ -4560,6 +4606,14 @@
 				Var CustomSweetState[4] = "Enable"
 				Var CustomSweetState[5] = "Enable"
 
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					Var CustomSweetState[4] = "Disable"
+					Var CustomSweetState[5] = "Disable"
+
+				EndIf
+
 				Var topping1 = toppingID1index1
 
 				Var UserSeletedSugar = 1
@@ -4581,40 +4635,62 @@
 		<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 		<Volume> SoundVolume </Volume>
 		<EventClick>
+		SAVELOG "SUGAR2"
+		DEBUGVAR SelectDrinkType
+		DEBUGVAR UserSeletedSugar
 
-			SAVELOG "SUGAR2"
-			DEBUGVAR SelectDrinkType
-			DEBUGVAR UserSeletedSugar
+		If SelectDrinkType = 0 Then
+			SAVELOG "drink type popup"
+			Var high_light_drink_type = "Enable"
+		Else
 
-			If SelectDrinkType = 0 Then
-				SAVELOG "drink type popup"
-				Var high_light_drink_type = "Enable"
-			Else
-				If ShiftSugarStep = 1 Then
+			If ShiftSugarStep = 1 Then
+				Var CustomSweetState[0] = "Enable"
+				Var CustomSweetState[1] = "PressForever"
+				Var CustomSweetState[2] = "Enable"
+				Var CustomSweetState[3] = "Enable"
+				Var CustomSweetState[4] = "Enable"
+				Var CustomSweetState[5] = "Enable"
+
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					Var CustomSweetState[4] = "Disable"
+					Var CustomSweetState[5] = "Disable"
 
-					Var CustomSweetState[0] = "Enable"
-					Var CustomSweetState[1] = "PressForever"
-					Var CustomSweetState[2] = "Enable"
-					Var CustomSweetState[3] = "Enable"
-					Var CustomSweetState[4] = "Enable"
-					Var CustomSweetState[5] = "Enable"
-					Var topping1 = toppingID1index2
-				EndIf
-				If ShiftSugarStep = 2 Then
-					Var CustomSweetState[1] = "PressForever"
-					Var CustomSweetState[2] = "Enable"
-					Var CustomSweetState[3] = "Enable"
-					Var CustomSweetState[4] = "Enable"
-					Var CustomSweetState[5] = "Enable"
-					Var topping1 = toppingID1index1
 				EndIf
 
-				Var UserSeletedSugar = 1
+				Var topping1 = toppingID1index2
 			EndIf
 
-			DEBUGVAR topping1
-			Refresh
-		</EventClick>
+			If ShiftSugarStep = 2 Then
+
+				Var CustomSweetState[1] = "PressForever"
+				Var CustomSweetState[2] = "Enable"
+				Var CustomSweetState[3] = "Enable"
+				Var CustomSweetState[4] = "Enable"
+				Var CustomSweetState[5] = "Enable"
+
+	; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					Var CustomSweetState[4] = "Disable"
+					Var CustomSweetState[5] = "Disable"
+
+				EndIf
+
+				Var topping1 = toppingID1index1
+			EndIf
+
+			Var SugarZeroCalCheck = "Enable"
+			Var SugarNormalCheck = "PressForever"
+
+			Var UserSeletedSugar = 1
+		EndIf
+
+		DEBUGVAR topping1
+		Refresh
+	</EventClick>
 	</Button>
 
 	; sugar3
@@ -4628,39 +4704,60 @@
 		<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 		<Volume> SoundVolume </Volume>
 		<EventClick>
-			SAVELOG "SUGAR3"
+		SAVELOG "SUGAR3"
 
-			If SelectDrinkType = 0 Then
-				SAVELOG "drink type popup"
-				Var high_light_drink_type = "Enable"
-			Else
+		If SelectDrinkType = 0 Then
+			SAVELOG "drink type popup"
+			Var high_light_drink_type = "Enable"
+		Else
 
-				If ShiftSugarStep = 1 Then
-					Var CustomSweetState[0] = "Enable"
-					Var CustomSweetState[1] = "Enable"
-					Var CustomSweetState[2] = "PressForever"
-					Var CustomSweetState[3] = "Enable"
-					Var CustomSweetState[4] = "Enable"
-					Var CustomSweetState[5] = "Enable"
+			If ShiftSugarStep = 1 Then
+				Var CustomSweetState[0] = "Enable"
+				Var CustomSweetState[1] = "Enable"
+				Var CustomSweetState[2] = "PressForever"
+				Var CustomSweetState[3] = "Enable"
+				Var CustomSweetState[4] = "Enable"
+				Var CustomSweetState[5] = "Enable"
+
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					Var CustomSweetState[4] = "Disable"
+					Var CustomSweetState[5] = "Disable"
 
-					Var topping1 = toppingID1index3
 				EndIf
 
-				If ShiftSugarStep = 2 Then
-					Var CustomSweetState[1] = "Enable"
-					Var CustomSweetState[2] = "PressForever"
-					Var CustomSweetState[3] = "Enable"
-					Var CustomSweetState[4] = "Enable"
-					Var CustomSweetState[5] = "Enable"
-					Var topping1 = toppingID1index2
-				EndIf
-
-
-				Var UserSeletedSugar = 1
+				Var topping1 = toppingID1index3
 			EndIf
-				DEBUGVAR topping1
-				Refresh
-		</EventClick>
+
+			If ShiftSugarStep = 2 Then
+				Var CustomSweetState[1] = "Enable"
+
+				Var CustomSweetState[2] = "PressForever"
+				Var CustomSweetState[3] = "Enable"
+				Var CustomSweetState[4] = "Enable"
+				Var CustomSweetState[5] = "Enable"
+
+
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					Var CustomSweetState[4] = "Disable"
+					Var CustomSweetState[5] = "Disable"
+
+				EndIf
+
+				Var topping1 = toppingID1index2
+			EndIf
+
+			Var SugarZeroCalCheck = "Enable"
+			Var SugarNormalCheck = "PressForever"
+			Var UserSeletedSugar = 1
+		EndIf
+
+		DEBUGVAR topping1
+		Refresh
+	</EventClick>
 	</Button>
 
 	; sugar4
@@ -4674,48 +4771,76 @@
 		<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 		<Volume> SoundVolume </Volume>
 		<EventClick>
+		SAVELOG "SUGAR4"
 
-			SAVELOG "SUGAR4"
+		If SelectDrinkType = 0 Then
+			SAVELOG "drink type popup"
+			Var high_light_drink_type = "Enable"
+		Else
 
-			If SelectDrinkType = 0 Then
-				SAVELOG "drink type popup"
-				Var high_light_drink_type = "Enable"
-			Else
+			If ShiftSugarStep = 1 Then
+				Var CustomSweetState[0] = "Enable"
+				Var CustomSweetState[1] = "Enable"
+				Var CustomSweetState[2] = "Enable"
+				Var CustomSweetState[3] = "PressForever"
+				Var CustomSweetState[4] = "Enable"
+				Var CustomSweetState[5] = "Enable"
 
-				If ShiftSugarStep = 1 Then
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					Var CustomSweetState[4] = "Disable"
+					Var CustomSweetState[5] = "Disable"
 
-					Var CustomSweetState[0] = "Enable"
-					Var CustomSweetState[1] = "Enable"
-					Var CustomSweetState[2] = "Enable"
-					Var CustomSweetState[3] = "PressForever"
-					Var CustomSweetState[4] = "Enable"
-					Var CustomSweetState[5] = "Enable"
-					Var topping1 = toppingID1index4
 				EndIf
 
-				If ShiftSugarStep = 2 Then
-					Var CustomSweetState[1] = "Enable"
-					Var CustomSweetState[2] = "Enable"
-					Var CustomSweetState[3] = "PressForever"
-					Var CustomSweetState[4] = "Enable"
-					Var CustomSweetState[5] = "Enable"
-					Var topping1 = toppingID1index3
-				EndIf
-
-				If ShiftSugarStep = 3 Then
-					Var CustomSweetState[3] = "PressForever"
-					Var CustomSweetState[4] = "Enable"
-					Var CustomSweetState[5] = "Enable"
-					Var topping1 = toppingID1index2
-				EndIf
-
-				Var UserSeletedSugar = 1
+				Var topping1 = toppingID1index4
 			EndIf
 
-			DEBUGVAR topping1
-			Refresh
+			If ShiftSugarStep = 2 Then
+				Var CustomSweetState[1] = "Enable"
 
-		</EventClick>
+				Var CustomSweetState[2] = "Enable"
+				Var CustomSweetState[3] = "PressForever"
+				Var CustomSweetState[4] = "Enable"
+				Var CustomSweetState[5] = "Enable"
+
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					Var CustomSweetState[4] = "Disable"
+					Var CustomSweetState[5] = "Disable"
+
+				EndIf
+
+				Var topping1 = toppingID1index3
+			EndIf
+
+			If ShiftSugarStep = 3 Then
+
+				Var CustomSweetState[3] = "PressForever"
+				Var CustomSweetState[4] = "Enable"
+				Var CustomSweetState[5] = "Enable"
+
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					Var CustomSweetState[4] = "Disable"
+					Var CustomSweetState[5] = "Disable"
+
+				EndIf
+
+				Var topping1 = toppingID1index2
+			EndIf
+
+			Var SugarZeroCalCheck = "Enable"
+			Var SugarNormalCheck = "PressForever"
+			Var UserSeletedSugar = 1
+		EndIf
+
+		DEBUGVAR topping1
+		Refresh
+	</EventClick>
 	</Button>
 
 	; sugar5
@@ -4735,41 +4860,70 @@
 				SAVELOG "drink type popup"
 				Var high_light_drink_type = "Enable"
 			Else
-				If ShiftSugarStep = 1 Then
 
+				If ShiftSugarStep = 1 Then
 					Var CustomSweetState[0] = "Enable"
 					Var CustomSweetState[1] = "Enable"
 					Var CustomSweetState[2] = "Enable"
 					Var CustomSweetState[3] = "Enable"
 					Var CustomSweetState[4] = "PressForever"
 					Var CustomSweetState[5] = "Enable"
+
+					; No 2 right steps
+					If NoSugarStepRight2 = "true" Then
+
+						Var CustomSweetState[4] = "Disable"
+						Var CustomSweetState[5] = "Disable"
+
+					EndIf
+
 					Var topping1 = toppingID1index5
 				EndIf
 
 				If ShiftSugarStep = 2 Then
 					Var CustomSweetState[1] = "Enable"
+
 					Var CustomSweetState[2] = "Enable"
 					Var CustomSweetState[3] = "Enable"
 					Var CustomSweetState[4] = "PressForever"
 					Var CustomSweetState[5] = "Enable"
+
+					; No 2 right steps
+					If NoSugarStepRight2 = "true" Then
+
+						Var CustomSweetState[4] = "Disable"
+						Var CustomSweetState[5] = "Disable"
+
+					EndIf
+
 					Var topping1 = toppingID1index4
 				EndIf
 
 				If ShiftSugarStep = 3 Then
+
 					Var CustomSweetState[3] = "Enable"
 					Var CustomSweetState[4] = "PressForever"
 					Var CustomSweetState[5] = "Enable"
+
+					; No 2 right steps
+					If NoSugarStepRight2 = "true" Then
+
+						Var CustomSweetState[4] = "Disable"
+						Var CustomSweetState[5] = "Disable"
+
+					EndIf
+
 					Var topping1 = toppingID1index3
 				EndIf
 
+				Var SugarZeroCalCheck = "Enable"
+				Var SugarNormalCheck = "PressForever"
 				Var UserSeletedSugar = 1
 			EndIf
 
-			
 			DEBUGVAR topping1
 			Refresh
-
-		</EventClick>
+	</EventClick>
 	</Button>
 
 	; sugar6
@@ -4783,46 +4937,76 @@
 		<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 		<Volume> SoundVolume </Volume>
 		<EventClick>
-			SAVELOG "SUGAR6"
+		SAVELOG "SUGAR6"
 
-			If SelectDrinkType = 0 Then
-				SAVELOG "drink type popup"
-				Var high_light_drink_type = "Enable"
-			Else
+		If SelectDrinkType = 0 Then
+			SAVELOG "drink type popup"
+			Var high_light_drink_type = "Enable"
+		Else
 
-				If ShiftSugarStep = 1 Then
+			If ShiftSugarStep = 1 Then
+				Var CustomSweetState[0] = "Enable"
+				Var CustomSweetState[1] = "Enable"
+				Var CustomSweetState[2] = "Enable"
+				Var CustomSweetState[3] = "Enable"
+				Var CustomSweetState[4] = "Enable"
+				Var CustomSweetState[5] = "PressForever"
+
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					Var CustomSweetState[4] = "Disable"
+					Var CustomSweetState[5] = "Disable"
 
-					Var CustomSweetState[0] = "Enable"
-					Var CustomSweetState[1] = "Enable"
-					Var CustomSweetState[2] = "Enable"
-					Var CustomSweetState[3] = "Enable"
-					Var CustomSweetState[4] = "Enable"
-					Var CustomSweetState[5] = "PressForever"
-					Var topping1 = toppingID1index6
 				EndIf
 
-				If ShiftSugarStep = 2 Then
-					Var CustomSweetState[2] = "Enable"
-					Var CustomSweetState[3] = "Enable"
-					Var CustomSweetState[4] = "Enable"
-					Var CustomSweetState[5] = "PressForever"
-					Var topping1 = toppingID1index5
-				EndIf
-
-				If ShiftSugarStep = 3 Then
-					Var CustomSweetState[3] = "Enable"
-					Var CustomSweetState[4] = "Enable"
-					Var CustomSweetState[5] = "PressForever"
-					Var topping1 = toppingID1index4
-				EndIf
-
-				Var UserSeletedSugar = 1
+				Var topping1 = toppingID1index6
 			EndIf
 
-			DEBUGVAR topping1
-			Refresh
+			If ShiftSugarStep = 2 Then
+				Var CustomSweetState[1] = "Enable"
 
-		</EventClick>
+				Var CustomSweetState[2] = "Enable"
+				Var CustomSweetState[3] = "Enable"
+				Var CustomSweetState[4] = "Enable"
+				Var CustomSweetState[5] = "PressForever"
+
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					Var CustomSweetState[4] = "Disable"
+					Var CustomSweetState[5] = "Disable"
+
+				EndIf
+
+				Var topping1 = toppingID1index5
+			EndIf
+
+			If ShiftSugarStep = 3 Then
+
+				Var CustomSweetState[3] = "Enable"
+				Var CustomSweetState[4] = "Enable"
+				Var CustomSweetState[5] = "PressForever"
+
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					Var CustomSweetState[4] = "Disable"
+					Var CustomSweetState[5] = "Disable"
+
+				EndIf
+
+				Var topping1 = toppingID1index4
+			EndIf
+
+			Var SugarZeroCalCheck = "Enable"
+			Var SugarNormalCheck = "PressForever"
+			Var UserSeletedSugar = 1
+		EndIf
+
+		DEBUGVAR topping1
+		Refresh
+	</EventClick>
 	</Button>
 
 
@@ -4985,49 +5169,56 @@
 		<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 		<Volume> SoundVolume </Volume>
 		<EventClick>
-			SAVELOG "SUGAR1"
-			If SelectDrinkType = 0 Then
-				SAVELOG "drink type popup"
-				Var high_light_drink_type = "Enable"
-			Else
+		DEBUGVAR CustomSweetState[0]
+		SAVELOG "SUGAR1"
 
-				If ShiftSugarStep = 1 Then
-					Var CustomSweetState[0] = "PressForever"
-					Var CustomSweetState[1] = "Enable"
-					Var CustomSweetState[2] = "Enable"
-					Var CustomSweetState[3] = "Enable"
-					Var CustomSweetState[4] = "Enable"
-					Var CustomSweetState[5] = "Enable"
+		If SelectDrinkType = 0 Then
+			SAVELOG "drink type popup"
+			Var high_light_drink_type = "Enable"
 
-					; No 2 right steps
-					If NoSugarStepRight2 = "true" Then
-
-						Var CustomSweetState[4] = "Disable"
-						Var CustomSweetState[5] = "Disable"
-
-					EndIf
-
-					Var topping1 = toppingID1index1
-				EndIf
-
-				Var UserSeletedSugar = 1
-				Var SugarNormalCheck = "PressForever"
-				If SugarZeroCalEnable = "true" Then
-					If SugarZeroCalCheck = "Disable2" Then
-
-					Else
-						Var SugarZeroCalCheck = "Disable"
-					EndIf
-				EndIf
-
-				DEBUGVAR SugarZeroCalCheck
-
-				Function 2
-
-			EndIf
-			DEBUGVAR topping1
 			Refresh
-		</EventClick>
+		Else
+
+			If ShiftSugarStep = 1 Then
+
+				Var CustomSweetState[0] = "PressForever"
+				Var CustomSweetState[1] = "Enable"
+				Var CustomSweetState[2] = "Enable"
+				Var CustomSweetState[3] = "Enable"
+				Var CustomSweetState[4] = "Enable"
+				Var CustomSweetState[5] = "Enable"
+
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					Var CustomSweetState[4] = "Disable"
+					Var CustomSweetState[5] = "Disable"
+
+				EndIf
+
+				Var topping1 = toppingID1index1
+			EndIf
+
+			Var UserSeletedSugar = 1
+			Var SugarNormalCheck = "PressForever"
+			If SugarZeroCalEnable = "true" Then
+				If SugarZeroCalCheck = "Disable2" Then
+
+				Else
+					Var SugarZeroCalCheck = "Disable"
+				EndIf
+			EndIf
+
+			DEBUGVAR SugarZeroCalCheck
+
+			Function 2
+		EndIf
+
+		DEBUGVAR topping1
+
+
+		;Refresh
+</EventClick>
 	</Button>
 
 	; sugar2
@@ -5041,7 +5232,6 @@
 		<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 		<Volume> SoundVolume </Volume>
 		<EventClick>
-
 			SAVELOG "SUGAR2"
 			DEBUGVAR SelectDrinkType
 			DEBUGVAR UserSeletedSugar
@@ -5050,8 +5240,8 @@
 				SAVELOG "drink type popup"
 				Var high_light_drink_type = "Enable"
 			Else
-				If ShiftSugarStep = 1 Then
 
+				If ShiftSugarStep = 1 Then
 					Var CustomSweetState[0] = "Enable"
 					Var CustomSweetState[1] = "PressForever"
 					Var CustomSweetState[2] = "Enable"
@@ -5071,6 +5261,7 @@
 				EndIf
 
 				If ShiftSugarStep = 2 Then
+
 					Var CustomSweetState[1] = "PressForever"
 					Var CustomSweetState[2] = "Enable"
 					Var CustomSweetState[3] = "Enable"
@@ -5151,11 +5342,13 @@
 
 				If ShiftSugarStep = 2 Then
 					Var CustomSweetState[1] = "Enable"
+
 					Var CustomSweetState[2] = "PressForever"
 					Var CustomSweetState[3] = "Enable"
 					Var CustomSweetState[4] = "Enable"
 					Var CustomSweetState[5] = "Enable"
 
+
 					; No 2 right steps
 					If NoSugarStepRight2 = "true" Then
 
@@ -5185,8 +5378,9 @@
 
 				Var UserSeletedSugar = 1
 			EndIf
-				DEBUGVAR topping1
-				Refresh
+
+			DEBUGVAR topping1
+			Refresh
 		</EventClick>
 	</Button>
 
@@ -5201,7 +5395,6 @@
 		<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 		<Volume> SoundVolume </Volume>
 		<EventClick>
-
 			SAVELOG "SUGAR4"
 
 			If SelectDrinkType = 0 Then
@@ -5210,7 +5403,6 @@
 			Else
 
 				If ShiftSugarStep = 1 Then
-
 					Var CustomSweetState[0] = "Enable"
 					Var CustomSweetState[1] = "Enable"
 					Var CustomSweetState[2] = "Enable"
@@ -5231,6 +5423,7 @@
 
 				If ShiftSugarStep = 2 Then
 					Var CustomSweetState[1] = "Enable"
+
 					Var CustomSweetState[2] = "Enable"
 					Var CustomSweetState[3] = "PressForever"
 					Var CustomSweetState[4] = "Enable"
@@ -5248,6 +5441,7 @@
 				EndIf
 
 				If ShiftSugarStep = 3 Then
+
 					Var CustomSweetState[3] = "PressForever"
 					Var CustomSweetState[4] = "Enable"
 					Var CustomSweetState[5] = "Enable"
@@ -5279,12 +5473,13 @@
 					EndIf
 				EndIf
 
+
+
 				Var UserSeletedSugar = 1
 			EndIf
 
 			DEBUGVAR topping1
 			Refresh
-
 		</EventClick>
 	</Button>
 
@@ -5305,8 +5500,8 @@
 				SAVELOG "drink type popup"
 				Var high_light_drink_type = "Enable"
 			Else
-				If ShiftSugarStep = 1 Then
 
+				If ShiftSugarStep = 1 Then
 					Var CustomSweetState[0] = "Enable"
 					Var CustomSweetState[1] = "Enable"
 					Var CustomSweetState[2] = "Enable"
@@ -5327,6 +5522,7 @@
 
 				If ShiftSugarStep = 2 Then
 					Var CustomSweetState[1] = "Enable"
+
 					Var CustomSweetState[2] = "Enable"
 					Var CustomSweetState[3] = "Enable"
 					Var CustomSweetState[4] = "PressForever"
@@ -5344,6 +5540,7 @@
 				EndIf
 
 				If ShiftSugarStep = 3 Then
+
 					Var CustomSweetState[3] = "Enable"
 					Var CustomSweetState[4] = "PressForever"
 					Var CustomSweetState[5] = "Enable"
@@ -5369,10 +5566,8 @@
 				Var UserSeletedSugar = 1
 			EndIf
 
-			
 			DEBUGVAR topping1
 			Refresh
-
 		</EventClick>
 	</Button>
 
@@ -5395,7 +5590,6 @@
 			Else
 
 				If ShiftSugarStep = 1 Then
-
 					Var CustomSweetState[0] = "Enable"
 					Var CustomSweetState[1] = "Enable"
 					Var CustomSweetState[2] = "Enable"
@@ -5415,6 +5609,8 @@
 				EndIf
 
 				If ShiftSugarStep = 2 Then
+					Var CustomSweetState[1] = "Enable"
+
 					Var CustomSweetState[2] = "Enable"
 					Var CustomSweetState[3] = "Enable"
 					Var CustomSweetState[4] = "Enable"
@@ -5432,6 +5628,7 @@
 				EndIf
 
 				If ShiftSugarStep = 3 Then
+
 					Var CustomSweetState[3] = "Enable"
 					Var CustomSweetState[4] = "Enable"
 					Var CustomSweetState[5] = "PressForever"
@@ -5458,7 +5655,6 @@
 
 			DEBUGVAR topping1
 			Refresh
-
 		</EventClick>
 	</Button>