diff --git a/image/topping/bn_shot_1.png b/image/topping/bn_shot_1.png
new file mode 100644
index 00000000..7f155ccf
Binary files /dev/null and b/image/topping/bn_shot_1.png differ
diff --git a/image/topping/bn_shot_2.png b/image/topping/bn_shot_2.png
new file mode 100644
index 00000000..96ca407f
Binary files /dev/null and b/image/topping/bn_shot_2.png differ
diff --git a/image/topping/bp_shot_1.png b/image/topping/bp_shot_1.png
new file mode 100644
index 00000000..8c200561
Binary files /dev/null and b/image/topping/bp_shot_1.png differ
diff --git a/image/topping_en/img_ontop_shot2.png b/image/topping_en/img_ontop_shot2.png
new file mode 100644
index 00000000..814f229d
Binary files /dev/null and b/image/topping_en/img_ontop_shot2.png differ
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 33f2bd57..aeabec3e 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -139,7 +139,7 @@
 
 	Var buttonRemoveCup = "Invisible"
 
-	LED LedDoorCup Blink 255 255 255 255
+	LED LedDoorCup 1 255 255 255 255
 
 	LED LedDoorLid Off 255 255 255 255
 </EventOpen>
diff --git a/xml/page_lid_straw.xml b/xml/page_lid_straw.xml
index f35e4d96..146f828c 100644
--- a/xml/page_lid_straw.xml
+++ b/xml/page_lid_straw.xml
@@ -82,14 +82,6 @@
 
 	If lidAndStrawOldPageIgnore = "true" Then
 		Var lidAndStrawOldPageIgnore = "false"
-		If StarwState = "Press" Then
-			Machine Straw
-			LED LedDoorLid Blink 255 255 255 255
-		EndIf
-		If LidState = "Press" Then
-			Machine Lid
-			LED LedDoorLid Blink 255 255 255 255
-		EndIf
 		Open "ROOT/taobin_project/xml/page_brewing3.xml"  
 	EndIf
 
@@ -97,11 +89,13 @@
 
 	DEBUGVAR BrewParam
 	DEBUGVAR IgnoreLidStraw
+	DEBUGVAR Service_LidStraw
 	
 	
 
 	If IgnoreLidStraw = "true" Then
 		Var IgnoreLidStraw = "false"
+		SAVELOG "Ignore lid straw because recipe disable"
 		Open "ROOT/taobin_project/xml/page_brewing3.xml"  
 	EndIf
 
diff --git a/xml/page_show_error.xml b/xml/page_show_error.xml
index adc5d4cd..a952109f 100644
--- a/xml/page_show_error.xml
+++ b/xml/page_show_error.xml
@@ -20,8 +20,13 @@
 
 	StopLongPlay
 
-	LED LedDoorCup On 255 0 0 255
-	LED LedDoorLid Off 255 255 255 255
+	If LEDSet = "true" Then
+
+	Else
+		LED LedDoorCup On 255 0 0 255
+		LED LedDoorLid Off 255 255 255 255
+	EndIf
+
 </EventOpen>
 <Timeout> 5000 </Timeout>
 <EventTimeout>
@@ -31,10 +36,14 @@
 
 
 	If MachineStage = "show-menu" Then
+		
+		Var LEDSet = "false"
 		Open "ROOT/taobin_project/xml/page_board.xml"
 
 	EndIf
 	If MachineStage = "remove-cup" Then
+	
+		Var LEDSet = "false"
 		Open "ROOT/taobin_project/xml/page_remove_cup.xml"
 
 	EndIf
@@ -42,7 +51,7 @@
 	;Refresh
 	;TimerReset
 
-
+	Var LEDSet = "true"
 	Open "ROOT/taobin_project/xml/page_show_error.xml"
 </EventTimeout>
 
diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml
index 69d4afa1..3ec7fc1a 100644
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@@ -34,6 +34,18 @@
 		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
 	EndIf
 
+	DEBUGVAR StarwState
+	DEBUGVAR LidState
+	
+
+	If StarwState = "Press" Then
+		Machine Straw
+		LED LedDoorLid Blink 255 255 255 255
+	EndIf
+	If LidState = "Press" Then
+		Machine Lid
+		LED LedDoorLid Blink 255 255 255 255
+	EndIf
 	
 
 </EventOpen>
diff --git a/xml/page_topping_select.xml b/xml/page_topping_select.xml
index 25ddbbbc..d643f976 100644
--- a/xml/page_topping_select.xml
+++ b/xml/page_topping_select.xml
@@ -60,6 +60,7 @@
 	EndIf
 
 
+	Machine DoorClose
 	
 	
 
@@ -235,6 +236,7 @@
 
 		;PressForever
 		If TOPPING1 = "Sugar" Then
+			Var BGSugar = "Enable"
 			Var ShiftSugarStep = 1
 			Var SugarState1 = "Enable"
 			Var SugarState2 = "Enable"
@@ -265,6 +267,7 @@
 		EndIf
 		
 		If TOPPING1 = "Powder Sugar" Then
+			Var BGSugar = "Enable"
 			Var ShiftSugarStep = 1
 			Var SugarState1 = "Enable"
 			Var SugarState2 = "Enable"
@@ -296,6 +299,7 @@
 		
 
 		If TOPPING1 = "Sugar Premix 25" Then
+			Var BGSugar = "Enable"
 			Var ShiftSugarStep = 2
 			Var SugarState2 = "Enable"
 			Var SugarState3 = "Enable"
@@ -321,6 +325,7 @@
 		EndIf
 
 		If TOPPING1 = "Powder Sugar Premix 50" Then
+			Var BGSugar = "Enable"
 			Var ShiftSugarStep = 3
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
@@ -341,6 +346,7 @@
 		EndIf
 
 		If TOPPING1 = "Powder Sugar Premix 25" Then
+			Var BGSugar = "Enable"
 			Var ShiftSugarStep = 2
 			Var SugarState2 = "Enable"
 			Var SugarState3 = "Enable"
@@ -367,18 +373,21 @@
 
 
 
-		Var BGSugar = "Enable"
+				
+
 		Var BugFlag = 1
+		
 		Var topping1 = toppingID1Default
 
 		Var ToppingGotoPayment = "false"
 		
-		If show_eng = "true" Then 
-			Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
-		Else
-			Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
+		If BGSugar = "Enable" Then
+			If show_eng = "true" Then 
+				Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
+			Else
+				Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
+			EndIf
 		EndIf
-		
 		Refresh
 		
 
@@ -496,7 +505,7 @@
 <EventClick> 
 
 	Var PriceDrink = PriceDrinkTmp
-	
+	SAVELOG "USER press next ( topping )"
 	DEBUGVAR topping1
 	DEBUGVAR topping2
 	DEBUGVAR topping3
@@ -688,7 +697,7 @@
 		Var SugarState3 = "Enable"
 		Var SugarState4 = "PressForever"
 		Var SugarState5 = "Enable"
-		Var topping1 = toppingID1index4
+		Var topping1 = toppingID1index2
 	EndIf
 
 
@@ -750,7 +759,7 @@
 ;-BEGIN shot layout
 <Block>	
 <Width> 986 </Width>
-<Height> 232 </Height>
+<Height> 224 </Height>
 <MarginTop> 5 </MarginTop>
 <State> ShotCoffeeBG </State>
 <Image>
@@ -833,7 +842,7 @@
 ;-BEGIN shot layout
 <Block>	
 <Width> 986 </Width>
-<Height> 232 </Height>
+<Height> 224 </Height>
 <MarginTop> 5 </MarginTop>
 <State> ShotCoffeePremium </State>
 <Image>