diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml
index be80d7d2..1ab45fd6 100644
--- a/xml/page_drinkok.xml
+++ b/xml/page_drinkok.xml
@@ -10,14 +10,14 @@
 	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
+	;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
 
 	; On open
 	Var LidState = "Enable"
@@ -74,7 +74,7 @@
 	EndIf
 	
 	If MachineStage = "remove-cup" Then
-		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+		Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
 
 	EndIf
 
diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml
index f032c9a5..7dc64029 100644
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@@ -37,7 +37,14 @@
 	DEBUGVAR StarwState
 	DEBUGVAR LidState
 	
-
+	If StarwState = "Press" Then
+		Machine StrawWithDelay
+		LED LedDoorLid Blink 255 255 255 255
+	EndIf
+	If LidState = "Press" Then
+		Machine LidWithDelay
+		LED LedDoorLid Blink 255 255 255 255
+	EndIf
 	
 
 </EventOpen>