diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml
index 922319ce..5b115128 100644
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@@ -433,59 +433,14 @@
 	DEBUGVAR NeedUpgrade
 	DEBUGVAR NeedReboot
 	DEBUGVAR SELLSTATUS
-
-	; copy stage
-	Var bg_lidProblem_ST2 = bg_lidProblem_ST
-	DEBUGVAR bg_lidProblem_ST2
 	
-	; zone Language
-	If LanguageObjectShow = "Enable" Then
-		Var XStraw = 350
-		Var SelectMenuBetweenBrewEnable2 = SelectMenuBetweenBrewEnable1
-		Var SelectMenuBetweenBrewEnable1 = "Invisible"
+	DEBUGVAR bg_lidProblem_ST
 
-		Var IMG_CNT = "ROOT/taobin_project/image/page_doing_inter/bg_show_time_remaining.png"
-
-		Var bg_lidProblem_ST = "Invisible"
-		Var GetLidButtonState = "Invisible"
-		Var bg_strawProblem_ST = "Invisible"
-		var EnableGetMoreStrawFileName = "Invisible"
-		var EnableGetMoreStrawFileName2 = "Enable"
-
-		Var bg_strawProblem_ST2 = "Invisible"
-
-		If bg_lidProblem_ST2 = "Invisible" Then 
-			Var GetLidButtonState2 = "Enable"
-		Else
-			Var GetLidButtonState2 = "Invisible"
-		EndIf
 
+	If bg_lidProblem_ST = "Invisible" Then 
+		Var GetLidButtonState = "Enable"
+		;Var XStraw = 265
 	EndIf
-	
-
-	
-	If NoLangObjectShow = "Enable" Then
-		Var SelectMenuBetweenBrewEnable2 = "Invisible"
-
-		Var bg_lidProblem_ST2 = "Invisible"
-		Var GetLidButtonState2 = "Invisible"
-		Var bg_strawProblem_ST2 = "Invisible"
-		var EnableGetMoreStrawFileName2 = "Invisible"
-
-
-		DEBUGVAR bg_lidProblem_ST
-
-
-		If bg_lidProblem_ST = "Invisible" Then 
-			Var GetLidButtonState = "Enable"
-			;Var XStraw = 265
-		EndIf
-
-
-	EndIf
-
-	DEBUGVAR LanguageObjectShow
-	DEBUGVAR NoLangObjectShow
 
 
 	Var CreditCardVoid = 0
@@ -509,10 +464,17 @@
 
 	; language instance
 
+	If bg_lidProblem_ST = "Enable" Then
+		Var EnableTopupCreditBetweenBrew = "Invisible"
+		Var EnableGetMore
+	End
 
+	If bg_strawProblem_ST = "Enable" Then
+		Var EnableGetMoreStrawFileName = "Invisible"
+		Var EnableTopupCreditBetweenBrew = "Invisible"
+	EndIf
 
 	DEBUGVAR SelectMenuBetweenBrewEnable1
-	DEBUGVAR SelectMenuBetweenBrewEnable2
 
 	Var SelectMenuBetweenBrewEnable1Text = SelectMenuBetweenBrewEnable1
 	
@@ -1459,7 +1421,6 @@
 	If CLOSE_ORDER_NOW = "true" Then
 		Var SelectMenuBetweenBrewEnable1 = "Invisible"
 		Var SelectMenuBetweenBrewEnable1Text = "Invisible"
-		Var SelectMenuBetweenBrewEnable2 = "Invisible"
 		Var EnableTopupCreditBetweenBrew = "Invisible"
 		
 	EndIf
@@ -1478,16 +1439,7 @@
 		EndIf
 		
 	Else
-		If SelectMenuBetweenBrewEnable2 = "Enable" Then 
-			If SelectMenuBetweenBrewEnable1Blink = "Enable" Then 
-				Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
-			Else
-				Var SelectMenuBetweenBrewEnable1Blink = "Enable"
-			EndIf
-			
-		Else
-			Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
-		EndIf
+		Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
 	EndIf
 	
 	DEBUGVAR CountUpBrewing
@@ -1676,34 +1628,17 @@
 
 		EndIf
 	EndIf
-
-	If EnableGetMoreStrawFileName2 = "PressForever" Then
-		DEBUGVAR GetMoreStrawCount
-		If GetMoreStrawCount > 0 Then 
-			If EnableGetMoreStrawFileNameCountDown > 0 Then
-				Var EnableGetMoreStrawFileNameCountDown = EnableGetMoreStrawFileNameCountDown - 1
-
-				If EnableGetMoreStrawFileNameCountDown = 0 Then
-					Var EnableGetMoreStrawFileName2 = "Enable"
-				EndIf
-			EndIf
-
-		EndIf
-	EndIf
 		
 	If GetMoreStrawCount <= 0 Then
 		If StrawProblemStatus = 1 Then
 			Var StrawProblemStatus = 2
 			
-			If NoLangObjectShow = "Enable" Then
-				Var bg_strawProblem_ST = "Enable"
-			Else
-				Var bg_strawProblem_ST2 = "Enable"
-			EndIf
+			Var bg_strawProblem_ST = "Enable"
+			Var EnableTopupCreditBetweenBrew = "Invisible"
+			Var EnableGetMoreStrawFileName = "Invisible"
 		EndIf
 
 	EndIf
-	DEBUGVAR bg_lidProblem_ST2
 	
 
 	If GetLidButtonCountDown > 0 Then
@@ -1718,26 +1653,16 @@
 		Var GetLidButtonCountDown = 0
 	EndIf
 	
-	If NoLangObjectShow = "Enable" Then
-
-		If GetLidButtonCountDown = 1 Then
-			Var GetLidButtonState = "Invisible"
-			Var bg_lidProblem_ST = "Enable"
-			;Var XStraw = 356
+	If GetLidButtonCountDown = 1 Then
+		Var GetLidButtonState = "Invisible"
+		Var bg_lidProblem_ST = "Enable"
+		Var EnableTopupCreditBetweenBrew = "Invisible"
+		;Var XStraw = 356
 
+		If EnableGetMoreStrawFileName = "Enable" Then
+			Var XStraw = 280
 		EndIf
-	EndIf
 
-	Var bg_lidProblem_ST = "Invisible"
-		
-	If LanguageObjectShow = "Enable" Then
-		
-		If GetLidButtonCountDown = 1 Then
-			Var GetLidButtonState2 = "Invisible"
-			Var bg_lidProblem_ST2 = "Enable"
-			Var XStraw = 365
-
-		EndIf
 	EndIf
 
 	If ButtonGameCountDown > 0 Then
@@ -1843,16 +1768,6 @@
 <Filename> text_next_order </Filename>
 </Image>
 
-<Text>
-<X> 0 </X>
-<Y> 1655 </Y>
-<Width> 1080 </Width>
-<State> SelectMenuBetweenBrewEnable2 </State>
-<Language>
-	<ID> 000408 </ID>
-</Language>
-</Text>
-
 
 <Image>
 <X> 835 </X>
@@ -1881,23 +1796,6 @@
 <Value> ShowCountDownBrewing </Value>
 </Text>
 
-<Text>
-<X> 816 </X>
-<Y> 429 </Y>
-<State> LanguageObjectShow </State>
-<Language>
-	<ID> 000405 </ID>
-</Language>
-</Text>
-<Text>
-<X> 941 </X>
-<Y> 518 </Y>
-<State> LanguageObjectShow </State>
-<Language>
-	<ID> 000406 </ID>
-</Language>
-</Text>
-
 <EventUnitTest1>
 	Var BREW_COUNT_DOWN_FROM_APP = "off"
 	Var CountDownBrewing = 121
@@ -1962,32 +1860,6 @@
 </EventClick> 
 </Button>
 
-<Button>
-<X> 733 </X>
-<Y> 1787 </Y>
-<State>SelectMenuBetweenBrewEnable2</State>
-<Filename> "ROOT/taobin_project/image/page_doing_inter/bn_next_order.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page_doing_inter/bp_next_order.png" </FilenamePress>
-<EventClick> 
-	If MachineState_Result = 0 Then
-	
-		SAVELOG "User click next button"
-
-		Var Seeker = "next"
-		Var MultiPayEnable = "false"
-		CoinPause
-
-		Open "ROOT/taobin_project/xml/page_catalog.xml" 
-	EndIf
-</EventClick> 
-<Language>
-	<X> 0 </X>
-	<Y> 20 </Y>
-	<Width> 297 </Width>
-	<Height> 96 </Height>
-	<ID> 000407 </ID>
-</Language>
-</Button>
 
 ;
 ;
@@ -2018,8 +1890,8 @@
 </Button>
 
 <Button>
-<X> XStraw </X>
-<Y> 1787 </Y>
+<X> 270 </X>
+<Y> 1788 </Y>
 <State>bg_strawProblem_ST</State>
 <Filename>  bnStrawProblemReport </Filename>
 <FilenamePress> bpStrawProblemReport </FilenamePress>
@@ -2091,8 +1963,8 @@
 ; Lid button, Get one and report
 ;
 <Button>
-<X> 22 </X>
-<Y> 1787 </Y>
+<X> 20 </X>
+<Y> 1788 </Y>
 <State>bg_lidProblem_ST</State>
 <Filename>  bnLidProblemReport </Filename>
 <FilenamePress> bpLidProblemReport </FilenamePress>
@@ -2128,114 +2000,6 @@
 </EventClick> 
 </Button>
 
-;====================================================================
-<Button>
-<X> XStraw </X>
-<Y> 1787 </Y>
-<State> EnableGetMoreStrawFileName2 </State>
-<Filename> "ROOT/taobin_project/image/page_doing_inter/bn_get_more_straw.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page_doing_inter/bp_get_more_straw.png" </FilenamePress>
-<Mode> "No" </Mode>
-<EventClick> 
-	Var EnableGetMoreStrawFileNameCountDown = 5
-	Var EnableGetMoreStrawFileName2 = "PressForever"
-	Var GetMoreStrawCount = GetMoreStrawCount - 1
-
-	DEBUGVAR GetMoreStrawCount
-
-	If GetMoreStrawCount > 0 Then
-		Machine Straw
-	Else
-		Var EnableGetMoreStrawFileName2 = "Invisible"
-	EndIf
-</EventClick> 
-<Language>
-	<X> 50 </X>
-	<Y> 20 </Y>
-	<Width> 331 </Width>
-	<Height> 96 </Height>
-	<ID> 000402 </ID>
-</Language>
-</Button>
-
-<Button>
-<X> XStraw </X>
-<Y> 1787 </Y>
-<Height> 96 </Height>
-<State>bg_strawProblem_ST2</State>
-<Filename> "ROOT/taobin_project/image/page_doing_inter/bn_send_report.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page_doing_inter/bn_send_report.png" </FilenamePress>
-<EventClick> 
-
-	Var strawStr = "แจ้งปัญหาไม่ได้รับหลอด"
-	
-	__CMD "straw-alert-disable" 0 strawStr "-"
- 	__CMD "send-error-code" 1231 "-" "-"
-	Var bg_strawProblem_ST2 = "Invisible"
-
-	Refresh
-</EventClick> 
-<Language>
-	<X> 0 </X>
-	<Y> 12 </Y>
-	<Width> 331 </Width>
-	<Height> 96 </Height>
-	<ID> 000401 </ID>
-</Language>
-</Button>
-;-------------------------
-<Button>
-<X> 14 </X>
-<Y> 1787 </Y>
-<Height> 96 </Height>
-<State>bg_lidProblem_ST2</State>
-<Filename>  "ROOT/taobin_project/image/page_doing_inter/bn_send_report.png" </Filename>
-<FilenamePress>"ROOT/taobin_project/image/page_doing_inter/bn_send_report.png" </FilenamePress>
-<EventClick> 
-
-	Var lidStr = "แจ้งปัญหาไม่ได้รับฝา"
-	
-	__CMD "lid-alert-disable" 0 lidStr "-"
- 	__CMD "send-error-code" 1343 "-" "-"
-	Var bg_lidProblem_ST2 = "Invisible"
-
-	Refresh
-</EventClick> 
-<Language>
-	<X> 0 </X>
-	<Y> 12 </Y>
-	<Width> 331 </Width>
-	<Height> 96 </Height>
-	<ID> 000400 </ID>
-</Language>
-</Button>
-
-<Button>
-<X> 14 </X>
-<Y> 1787 </Y>
-<State>GetLidButtonState2</State>
-<Mode> "No" </Mode>
-<Filename>  "ROOT/taobin_project/image/page_doing_inter/bn_get_lid.png" </Filename>
-<FilenamePress>"ROOT/taobin_project/image/page_doing_inter/bp_get_lid.png" </FilenamePress>
-<EventClick> 
-
-	If GetLidButtonState2 = "Enable" Then
-		Machine Lid
-		Var GetLidButtonCountDown = 12
-	EndIf
-
-	Var GetLidButtonState2 = "Press"
-
-	Refresh
-</EventClick>
-<Language>
-	<X> 40 </X>
-	<Y> 20 </Y>
-	<Width> 232 </Width>
-	<Height> 96 </Height>
-	<ID> 000403 </ID>
-</Language>
-</Button>
 
 <EventUnitTest4>
 	; test drinkfail with phone number
diff --git a/xml/page_payment_credit3-1.xml b/xml/page_payment_credit3-1.xml
index b7ced0b2..4da5da6f 100644
--- a/xml/page_payment_credit3-1.xml
+++ b/xml/page_payment_credit3-1.xml
@@ -56,6 +56,7 @@
 		Var PayState2 = "Enable"
 		Var QRChannel = 0
 		;Var Seeker.CodeChannel = 0
+		Seeker.TNumberTaobinCredit = ""
 		If CART_COUNT >= 1 Then 
 			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
 		Else
@@ -182,6 +183,7 @@
 	Var QRChannel = 0
 	;Var Seeker.CodeChannel = 0
 	SAVELOG "payment_credit3-p121."
+	Var Seeker.TNumberTaobinCredit = ""
 	If CART_COUNT >= 1 Then 
 		Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
 	Else