diff --git a/xml/page_board.xml b/xml/page_board.xml
index c51b4dcd..43b648f3 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -65,13 +65,13 @@
 
 
 	If MachineStage = "close-maintenance" Then
-		;Open "ROOT/taobin_project/xml/page_show_error.xml"
+		Open "ROOT/taobin_project/xml/page_show_error.xml"
 
 	EndIf
 
 
 	If MachineStage = "drink-failed" Then
-		;Open "ROOT/taobin_project/xml/page_show_error.xml"
+		Open "ROOT/taobin_project/xml/page_show_error.xml"
 
 	EndIf
 
diff --git a/xml/page_got_free_idcard.xml b/xml/page_got_free_idcard.xml
index 82c64c04..ed8877d8 100644
--- a/xml/page_got_free_idcard.xml
+++ b/xml/page_got_free_idcard.xml
@@ -54,24 +54,6 @@
 <Filename> Var( DirImage + "/img_popup1.png" )</Filename>
 </Image>
 
-;
-<Image>
-<X> 751 </X>
-<Y> 413 </Y>
-<Filename> "ROOT/taobin_project/image/page_doing/img2.png" </Filename>
-</Image>
-;
-<Text>
-<X> XPosiShowCountDownBrew </X>
-<Y> 470 </Y>
-<Align> End </Align>
-<Width> 153 </Width>
-<Size> 88 </Size>
-<Font> RobotoBold </Font>
-<Color> 0x513C2F </Color>
-<Value> ShowCountDownBrewing </Value>
-</Text>
-
 
 </Popup>
 	
\ No newline at end of file
diff --git a/xml/page_payment.xml b/xml/page_payment.xml
index 7e1cf5e2..c25a0eb2 100644
--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@@ -15,7 +15,6 @@
 	Var MachineStage = "-"
 	Var HaveCup = "true"
 
-
 	;Var PriceDrink = 5
 
 	Var DiscountDrink = 0
diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml
index b9213e6e..803cc740 100644
--- a/xml/page_payment_code.xml
+++ b/xml/page_payment_code.xml
@@ -6,7 +6,7 @@
 <Background> "0xeae6e1" </Background>
 <Sound> "ROOT/sounds/Code8digit.m4a" </Sound>
 <Volume> SoundVolume </Volume>
-
+<Refresh> "Partial" </Refresh>
 <EventOpen>
 	; On open
 
@@ -47,10 +47,10 @@
 		Var CodeChannel = 0
 		Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
 
+		Refresh
 	EndIf
 
 	TimerReset
-	Refresh
 </EventTimeout> 
 
 <EventIDCard>
@@ -603,6 +603,7 @@
 <Size> 62 </Size>
 <Font> RobotoBlack </Font>
 <Color> 0x513C2F </Color>
+<Refresh> "Enable" </Refresh>
 <Value> TelephoneNumber </Value>
 </Text>
 
diff --git a/xml/page_show_consent2.xml b/xml/page_show_consent2.xml
index 8761804c..c09963f1 100644
--- a/xml/page_show_consent2.xml
+++ b/xml/page_show_consent2.xml
@@ -13,11 +13,15 @@
 	SAVELOG show_eng
 	
     If show_eng = "true" Then 
+    	Var DirImage2 = "ROOT/taobin_project/image/consent_en/"
+		
 		Var DirImage = "ROOT/taobin_project/image/consent_idcard_en/"
 		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
 		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
 
 	Else
+		Var DirImage2 = "ROOT/taobin_project/image/consent_en/"
+		
 		Var DirImage = "ROOT/taobin_project/image/consent_idcard/"
 		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
 		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
@@ -35,20 +39,17 @@
 		Open "ROOT/taobin_project/xml/page_payment_cash.xml"
 	EndIf
 
-	; add
+	; add test
 	If Timeout = 3 Then
 		;page_disqualified_idcard
 		;page_got_free_idcard
-		Open "ROOT/taobin_project/xml/page_got_free_idcard.xml"
+		;Open "ROOT/taobin_project/xml/page_got_free_idcard.xml"
 	EndIf
 
 	TimerReset
 	Refresh
 </EventTimeout> 
 
-<EventMachine>
-</EventMachine>
-
 <EventActionOk>
 
         Var IDValid = ""
@@ -56,20 +57,17 @@
         ; add
         SAVELOG Ext1a
 
-
-        SPLIT  Ext1a "|"  1  IDValid
-
-        ; add
-        Var IDValid = "ok"
-
-		If IDValid = "ok" Then
+		If Ext1a = "ok" Then
 
             Var FreeVendingCampaign = 1
             Var VendingCode = "C31"
             Var CodeChannel = 2
             Var CodeNumber = IDNum
 		    MakeDrinkV1  SelectDrink SelectSugarID
-		   	Open "ROOT/taobin_project/xml/page_thankyou.xml" 
+		   	; Old
+		   	;Open "ROOT/taobin_project/xml/page_thankyou.xml" 
+			; New
+			Open "ROOT/taobin_project/xml/page_got_free_idcard.xml"
 			
 		Else
             
@@ -127,8 +125,9 @@
 <X> 577 </X>
 <Y> 1679 </Y>
 <State> AcceptState</State>
-<Filename> Var( DirImage + "/bn_accept.png" )</Filename>
-<FilenamePress> Var( DirImage + "/bp_accept.png" ) </FilenamePress>
+<Filename> Var( DirImage2 + "/bn_accept.png" )</Filename>
+<FilenamePress> Var( DirImage2 + "/bp_accept.png" ) </FilenamePress>
+<FilenameDisable> Var( DirImage2 + "/bp_accept.png" ) </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -163,8 +162,8 @@
 <Button>
 <X> 218 </X>
 <Y> 1679 </Y>
-<Filename> Var( DirImage + "/bn_decline.png" ) </Filename>
-<FilenamePress> Var( DirImage + "/bp_decline.png" ) </FilenamePress>
+<Filename> Var( DirImage2 + "/bn_decline.png" ) </Filename>
+<FilenamePress> Var( DirImage2 + "/bp_decline.png" ) </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml
index 892b69ab..5a2ae3ad 100644
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@@ -18,7 +18,7 @@
 	Var ChangeFlag2 = 0
 
 </EventOpen>
-<Timeout> 1000 </Timeout>
+<Timeout> 800 </Timeout>
 <EventTimeout> 
 	Var CountDownBrewing = CountDownBrewing - 1
 	Var CountDownThankyou = CountDownThankyou - 1
diff --git a/xml/page_topping_with_barista.xml b/xml/page_topping_with_barista.xml
index 12578f36..56c47bf6 100644
--- a/xml/page_topping_with_barista.xml
+++ b/xml/page_topping_with_barista.xml
@@ -74,6 +74,23 @@
 		Var topping1 = toppingID1Default
 		Refresh
 	EndIf
+
+	If show_eng = "true" Then 
+		;Var DirImage = "ROOT/taobin_project/image/page2_en/page2"
+		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+		Var showname = NameDrink
+		Var showdesc = DrinkDescription
+
+	Else
+		;Var DirImage = "ROOT/taobin_project/image/page2"
+		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+		Var showname = NameDrinkTH
+		Var showdesc = DrinkDescriptionTH
+	EndIf
+	
+	CRLFToSpace showname
 	
 </EventOpen>
 <Timeout> 30000 </Timeout>
@@ -220,7 +237,7 @@
 <Size> 72 </Size>
 <Font> KanitMediumTTF </Font>
 <Color> 0x513C2F </Color>
-<Value> NameDrink </Value>
+<Value> showname </Value>
 </Text>
 
 <Text>
@@ -231,7 +248,7 @@
 <Size> 24 </Size>
 <Font> KanitLightTTF </Font>
 <Color> 0x6F5F51 </Color>
-<Value> DrinkDescription </Value>
+<Value> showdesc </Value>
 </Text>