diff --git a/xml/page_board.xml b/xml/page_board.xml
index 09c7f916..79f21e71 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -11,7 +11,7 @@
 	OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/topview_button_back_main.xml"
 	Var FileNumber = 1
 
-	Var taobin_version = "1.28"
+	Var taobin_version = "1.32"
 	; 1.00 is 
 
 	; On open
@@ -110,8 +110,6 @@
 
 	Var TimerFirst = "true"
 
-	; TODO: remove when release
-	;Var IgnoreNetCore = "true"
 
 	Var buttonRemoveCup = "Invisible"
 
@@ -202,7 +200,7 @@
 
 		DEBUGVAR CountUpReloadAll
 		
-		If CountUpReloadAll > 120 Then
+		If CountUpReloadAll > 180 Then
 
 			Var StartUpExt = "-"
 			Var CountUpReloadAll = 0
@@ -211,7 +209,7 @@
 		EndIf
 
 	EndIf
-
+	
 	If CupOnArm = "true" Then
 		Var buttonRemoveCup = "Enable"
 	Else
diff --git a/xml/page_catalog_choose_drink2.pml b/xml/page_catalog_choose_drink2.pml
index 8de20b70..1daa1f32 100644
--- a/xml/page_catalog_choose_drink2.pml
+++ b/xml/page_catalog_choose_drink2.pml
@@ -47,6 +47,8 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	; On open
+
+    DEBUGVAR $12-01-01-0012.Button
 	
 	If show_eng = "true" Then 
         Var showthaiText = "Invisible"
diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml
index b466fe8d..efce1fc1 100644
--- a/xml/page_catalog_choose_drink2.xml
+++ b/xml/page_catalog_choose_drink2.xml
@@ -10,6 +10,8 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	; On open
+
+    DEBUGVAR $12-01-01-0012.Button
 	
 	If show_eng = "true" Then 
         Var showthaiText = "Invisible"
diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml
index b387e738..8d3bf0e6 100644
--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@@ -1064,33 +1064,34 @@
 	EndIf
 
 	If countClick2 = 5 Then
+		If IgnoreNetCore = "true" Then
+			;Var MachineStage = "make-drink"
+			; make drink
+			
+			MakeDrinkV1 SelectDrink ExtendData
+			Open "ROOT/taobin_project/xml/page_thankyou.xml"
+			
+			;Var UnitTestType = "1"
+			Var UnitTestType = "2"
+			
+			;Open "ROOT/taobin_project/xml/page_show_consent2.xml"
+			
+			;Open "ROOT/taobin_project/xml/page_payment_code.xml"
+			
+			;Open "ROOT/taobin_project/xml/page_thankyou.xml"
 
-		Var MachineStage = "make-drink"
-		; make drink
-		
-		MakeDrinkV1 SelectDrink ExtendData
-		Open "ROOT/taobin_project/xml/page_thankyou.xml"
-		
-		;Var UnitTestType = "1"
-		Var UnitTestType = "2"
-		
-		;Open "ROOT/taobin_project/xml/page_show_consent2.xml"
-		
-		;Open "ROOT/taobin_project/xml/page_payment_code.xml"
-		
-		;Open "ROOT/taobin_project/xml/page_thankyou.xml"
+			;Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
+			
+			; show consent
+			;Open "ROOT/taobin_project/xml/page_show_consent.xml"
+			;Open "ROOT/taobin_project/xml/page_drinkok.xml"
 
-		;Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
-		
-		; show consent
-		;Open "ROOT/taobin_project/xml/page_show_consent.xml"
-		;Open "ROOT/taobin_project/xml/page_drinkok.xml"
-
-		
-		;Var CoffeePoint = 11
-		;Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
-		
-		;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_back_to_error.xml"
+			
+			;Var CoffeePoint = 11
+			;Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
+			
+			;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_back_to_error.xml"
+		EndIf
 	EndIf
 	Refresh
 </EventClick>