diff --git a/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml
index 966e746f..6c7ac6ac 100644
--- a/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml
+++ b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml
@@ -166,11 +166,11 @@
 		</Description>
 		<BlendState> $12-06-03-0001.Button </BlendState>
 		<BlendPrice> eval( 
-		If $12-06-03-0001.Price = -1 Then
-			Var return = "Free"
-		Else
-			Var return !assigned StringFmt(  $12-06-03-0001.Price , DisplayFormat, PreScaleConvertShow) 
-		EndIf
+		If $12-06-03-0001.Price = -1 Then
+			Var return = "Free"
+		Else
+			Var return !assigned StringFmt(  $12-06-03-0001.Price , DisplayFormat, PreScaleConvertShow) 
+		EndIf
 		) </BlendPrice>
 		<IceProcessingState>
 			eval(
@@ -228,17 +228,17 @@
 			Var PD_CODE3 = "12-06-03-0001"
 			; begin lang
 			Var aliasName[0] = "Mango Tao Pun"
-			Var aliasDesc[0] = "Real Mango"
+			Var aliasDesc[0] = "Real Mango"
 			Var aliasName[1] = "มะม่วงเต่าปั่น"
-			Var aliasDesc[1] = "มะม่วง"
+			Var aliasDesc[1] = "มะม่วง"
 			Var aliasName[2] = "-"
-			Var aliasDesc[2] = "-"
+			Var aliasDesc[2] = "-"
 			Var aliasName[3] = "-"
-			Var aliasDesc[3] = "-"
+			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
-			Var aliasDesc[4] = "-"
+			Var aliasDesc[4] = "-"
 			Var aliasName[5] = "-"
-			Var aliasDesc[5] = "-"
+			Var aliasDesc[5] = "-"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -375,11 +375,11 @@
 		</Description>
 		<BlendState> $12-06-03-0002.Button </BlendState>
 		<BlendPrice> eval( 
-		If $12-06-03-0002.Price = -1 Then
-			Var return = "Free"
-		Else
-			Var return !assigned StringFmt(  $12-06-03-0002.Price , DisplayFormat, PreScaleConvertShow) 
-		EndIf
+		If $12-06-03-0002.Price = -1 Then
+			Var return = "Free"
+		Else
+			Var return !assigned StringFmt(  $12-06-03-0002.Price , DisplayFormat, PreScaleConvertShow) 
+		EndIf
 		) </BlendPrice>
 		<IceProcessingState>
 			eval(
@@ -437,17 +437,17 @@
 			Var PD_CODE3 = "12-06-03-0002"
 			; begin lang
 			Var aliasName[0] = "Mango Lychee Tao Pun"
-			Var aliasDesc[0] = "Real Mango Lychee"
+			Var aliasDesc[0] = "Real Mango Lychee"
 			Var aliasName[1] = "มะม่่วงลิ้นจี่เต่าปั่น"
-			Var aliasDesc[1] = "มะม่วง ลิ้นจี่"
+			Var aliasDesc[1] = "มะม่วง ลิ้นจี่"
 			Var aliasName[2] = "-"
-			Var aliasDesc[2] = "-"
+			Var aliasDesc[2] = "-"
 			Var aliasName[3] = "-"
-			Var aliasDesc[3] = "-"
+			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
-			Var aliasDesc[4] = "-"
+			Var aliasDesc[4] = "-"
 			Var aliasName[5] = "-"
-			Var aliasDesc[5] = "-"
+			Var aliasDesc[5] = "-"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -584,11 +584,11 @@
 		</Description>
 		<BlendState> $12-06-03-0003.Button </BlendState>
 		<BlendPrice> eval( 
-		If $12-06-03-0003.Price = -1 Then
-			Var return = "Free"
-		Else
-			Var return !assigned StringFmt(  $12-06-03-0003.Price , DisplayFormat, PreScaleConvertShow) 
-		EndIf
+		If $12-06-03-0003.Price = -1 Then
+			Var return = "Free"
+		Else
+			Var return !assigned StringFmt(  $12-06-03-0003.Price , DisplayFormat, PreScaleConvertShow) 
+		EndIf
 		) </BlendPrice>
 		<IceProcessingState>
 			eval(
@@ -646,17 +646,17 @@
 			Var PD_CODE3 = "12-06-03-0003"
 			; begin lang
 			Var aliasName[0] = "Mango Strawberry Tao Pun"
-			Var aliasDesc[0] = "Real Mango Strawberry"
+			Var aliasDesc[0] = "Real Mango Strawberry"
 			Var aliasName[1] = "มะม่วงสตรอเบอรีเต่าปั่น"
-			Var aliasDesc[1] = "มะม่วง สตรอเบอรี"
+			Var aliasDesc[1] = "มะม่วง สตรอเบอรี"
 			Var aliasName[2] = "-"
-			Var aliasDesc[2] = "-"
+			Var aliasDesc[2] = "-"
 			Var aliasName[3] = "-"
-			Var aliasDesc[3] = "-"
+			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
-			Var aliasDesc[4] = "-"
+			Var aliasDesc[4] = "-"
 			Var aliasName[5] = "-"
-			Var aliasDesc[5] = "-"
+			Var aliasDesc[5] = "-"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -793,11 +793,11 @@
 		</Description>
 		<BlendState> $12-06-03-0004.Button </BlendState>
 		<BlendPrice> eval( 
-		If $12-06-03-0004.Price = -1 Then
-			Var return = "Free"
-		Else
-			Var return !assigned StringFmt(  $12-06-03-0004.Price , DisplayFormat, PreScaleConvertShow) 
-		EndIf
+		If $12-06-03-0004.Price = -1 Then
+			Var return = "Free"
+		Else
+			Var return !assigned StringFmt(  $12-06-03-0004.Price , DisplayFormat, PreScaleConvertShow) 
+		EndIf
 		) </BlendPrice>
 		<IceProcessingState>
 			eval(
@@ -855,17 +855,17 @@
 			Var PD_CODE3 = "12-06-03-0004"
 			; begin lang
 			Var aliasName[0] = "Mango Salak Tao Pun"
-			Var aliasDesc[0] = "Real Mango Salak"
+			Var aliasDesc[0] = "Real Mango Salak"
 			Var aliasName[1] = "มะม่วงสละเต่าปั่น"
-			Var aliasDesc[1] = "มะม่วง สละ"
+			Var aliasDesc[1] = "มะม่วง สละ"
 			Var aliasName[2] = "-"
-			Var aliasDesc[2] = "-"
+			Var aliasDesc[2] = "-"
 			Var aliasName[3] = "-"
-			Var aliasDesc[3] = "-"
+			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
-			Var aliasDesc[4] = "-"
+			Var aliasDesc[4] = "-"
 			Var aliasName[5] = "-"
-			Var aliasDesc[5] = "-"
+			Var aliasDesc[5] = "-"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -1002,11 +1002,11 @@
 		</Description>
 		<BlendState> $12-06-03-0005.Button </BlendState>
 		<BlendPrice> eval( 
-		If $12-06-03-0005.Price = -1 Then
-			Var return = "Free"
-		Else
-			Var return !assigned StringFmt(  $12-06-03-0005.Price , DisplayFormat, PreScaleConvertShow) 
-		EndIf
+		If $12-06-03-0005.Price = -1 Then
+			Var return = "Free"
+		Else
+			Var return !assigned StringFmt(  $12-06-03-0005.Price , DisplayFormat, PreScaleConvertShow) 
+		EndIf
 		) </BlendPrice>
 		<IceProcessingState>
 			eval(
@@ -1064,17 +1064,17 @@
 			Var PD_CODE3 = "12-06-03-0005"
 			; begin lang
 			Var aliasName[0] = "Mango Pure Matcha Tao Pun"
-			Var aliasDesc[0] = "Real Mango Matcha"
+			Var aliasDesc[0] = "Real Mango Matcha"
 			Var aliasName[1] = "มะม่วงมัทฉะเต่าปั่น"
-			Var aliasDesc[1] = "มะม่วง มัทฉะ"
+			Var aliasDesc[1] = "มะม่วง มัทฉะ"
 			Var aliasName[2] = "-"
-			Var aliasDesc[2] = "-"
+			Var aliasDesc[2] = "-"
 			Var aliasName[3] = "-"
-			Var aliasDesc[3] = "-"
+			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
-			Var aliasDesc[4] = "-"
+			Var aliasDesc[4] = "-"
 			Var aliasName[5] = "-"
-			Var aliasDesc[5] = "-"
+			Var aliasDesc[5] = "-"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -1211,11 +1211,11 @@
 		</Description>
 		<BlendState> $12-06-03-0006.Button </BlendState>
 		<BlendPrice> eval( 
-		If $12-06-03-0006.Price = -1 Then
-			Var return = "Free"
-		Else
-			Var return !assigned StringFmt(  $12-06-03-0006.Price , DisplayFormat, PreScaleConvertShow) 
-		EndIf
+		If $12-06-03-0006.Price = -1 Then
+			Var return = "Free"
+		Else
+			Var return !assigned StringFmt(  $12-06-03-0006.Price , DisplayFormat, PreScaleConvertShow) 
+		EndIf
 		) </BlendPrice>
 		<IceProcessingState>
 			eval(
@@ -1273,17 +1273,17 @@
 			Var PD_CODE3 = "12-06-03-0006"
 			; begin lang
 			Var aliasName[0] = "Mango Taiwanese Tea Tao Pun"
-			Var aliasDesc[0] = "Real Mango TaiwaneseTea"
+			Var aliasDesc[0] = "Real Mango TaiwaneseTea"
 			Var aliasName[1] = "มะม่วงชาไต้หวันเต่าปั่น"
-			Var aliasDesc[1] = "มะม่วง ชาไต้หวัน"
+			Var aliasDesc[1] = "มะม่วง ชาไต้หวัน"
 			Var aliasName[2] = "-"
-			Var aliasDesc[2] = "-"
+			Var aliasDesc[2] = "-"
 			Var aliasName[3] = "-"
-			Var aliasDesc[3] = "-"
+			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
-			Var aliasDesc[4] = "-"
+			Var aliasDesc[4] = "-"
 			Var aliasName[5] = "-"
-			Var aliasDesc[5] = "-"
+			Var aliasDesc[5] = "-"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml
index 105ab7c3..0472b116 100644
--- a/xml/page_thankyouConti.xml
+++ b/xml/page_thankyouConti.xml
@@ -49,14 +49,14 @@
 	EndIf
 
 	;inter-image
-	If LanguageShow = "MYANMAR" Then 
+	If LanguageShow = "MYANMAR" Then
 
 		Var BottomText = PicturePath + "text_bottom_eng.png"
 
 		Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr"
 	EndIf
 
-	If LanguageShow = "MSC" Then 
+	If LanguageShow = "MSC" Then
 
 		Var BottomText = PicturePath + "text_bottom_eng.png"
 
@@ -118,15 +118,15 @@
 	EndIf
 
 	;inter-image
-	If LanguageShow = "MYANMAR" Then 
+	If LanguageShow = "MYANMAR" Then
 		Var DirImage2 = "ROOT/taobin_project/image/complete_mmr/"
 	EndIf
 
-	If LanguageShow = "MSC" Then 
+	If LanguageShow = "MSC" Then
 		Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/complete_msc/"
 	EndIf
 
-	If LanguageShow = "MTC" Then 
+	If LanguageShow = "MTC" Then
 		Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/complete_mtc/"
 	EndIf
 
@@ -143,6 +143,8 @@
 
 	;include=ROOT/taobin_project/inc/remove_cup_event_open.inc
 
+	Var buttonRemoveCup = "Invisible"
+
 	SAVELOG "Thank you conti version TCT6"
 
 	;PendingFlag InternationalEnable
@@ -179,7 +181,7 @@
 		SAVELOG "Make next order by take-cup with close-maintenance 2"
 
 		Var error_code_stop_now = 1221
-		
+
 
 		If DoorCupPosition = "bottom" Then
 
@@ -192,7 +194,7 @@
 		If New_Payment = 1 Then
 			__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 		EndIf
-		
+
 		Open "ROOT/taobin_project/xml/page_cannotConti.xml	"
 
 	EndIf
@@ -203,29 +205,29 @@
 		SAVELOG "Make next order by take-cup with close-maintenance 3"
 
 		Var error_code_stop_now = CupErrorCodeForNextOrder
-		
+
 
 		If DoorCupPosition = "bottom" Then
 
 		Else
 			Var error_code_stop_now = 1296
 			__CMD "error-code-1296" 0 "-" "-"
-			
+
 		EndIf
 
 		If New_Payment = 1 Then
 			__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 		EndIf
-		
+
 		Var LastMakeDrinkResult = "fail"
 		Open "ROOT/taobin_project/xml/page_cannotConti.xml"
 
 	EndIf
 
 	; setvarint Timeout2 888
-	
+
 	If Timeout2 > 890 Then
-		
+
 		__CMD "cup-error-code" "-" "-" "-"
 		DEBUGVAR CupErrorCodeForNextOrder
 	EndIf
@@ -245,7 +247,7 @@
 
 	__CMD "check-cup" Seeker.selected_a_drink "-" "-"
 
-	; old condition 
+	; old condition
 	If HaveCup = "false" Then
 		If MachineStage = "show-menu" Then
 
@@ -342,13 +344,13 @@
 				__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 			EndIf
 			MakeDrinkV1  Seeker.selected_a_drink SelectSugarID
-		
+
 			If CountryName = "Thailand" Then
 
-				If New_Payment = 1 Then 
-					Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"  
+				If New_Payment = 1 Then
+					Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
 				Else
-					Open "ROOT/taobin_project/xml/page_brewing3.xml"  
+					Open "ROOT/taobin_project/xml/page_brewing3.xml"
 				EndIf
 			Else
 
@@ -357,12 +359,12 @@
 					Open Brew3Inter
 				Else
 					;obsolete
-					If New_Payment = 1 Then 
-						Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"  
+					If New_Payment = 1 Then
+						Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
 					Else
-						Open "ROOT/taobin_project/xml/page_brewing3.xml"  
+						Open "ROOT/taobin_project/xml/page_brewing3.xml"
 					EndIf
-				EndIf  
+				EndIf
 			EndIf
      	EndIf
 
@@ -384,6 +386,9 @@
 
 
 	;include=ROOT/taobin_project/inc/remove_cup_step.inc
+	If Timeout2 < 3 Then
+    	Var buttonRemoveCup = "Invisible"
+    EndIf
 
 	If buttonRemoveCup = "Invisible" Then
 		If show_eng = "true" Then
@@ -392,30 +397,30 @@
 			Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
 		EndIf
 		;inter-text
-		If LanguageShow = "MYANMAR" Then 
+		If LanguageShow = "MYANMAR" Then
 			Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
 		EndIf
-		If LanguageShow = "MSC" Then 
+		If LanguageShow = "MSC" Then
 			Var MachineErrorDetailAll = " 请拿杯子。"
 		EndIf
-		If LanguageShow = "MTC" Then 
+		If LanguageShow = "MTC" Then
 			Var MachineErrorDetailAll = " 請拿杯子。"
 		EndIf
-	Else 
+	Else
 		If CupChecking = "true" Then
 			If show_eng = "true" Then
 				Var MachineErrorDetailAll = " Please take a cup."
 			Else
 				Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
-			EndIf 
+			EndIf
 			;inter-text
-			If LanguageShow = "MYANMAR" Then 
+			If LanguageShow = "MYANMAR" Then
 				Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
 			EndIf
-			If LanguageShow = "MSC" Then 
+			If LanguageShow = "MSC" Then
 				Var MachineErrorDetailAll = " 请拿杯子。"
 			EndIf
-			If LanguageShow = "MTC" Then 
+			If LanguageShow = "MTC" Then
 				Var MachineErrorDetailAll = " 請拿杯子。"
 			EndIf
 		Else
@@ -425,25 +430,28 @@
 				Var MachineErrorDetailAll = " กรุณากดปุ่ม แล้วนำแก้วออกก่อนครับ/คะ"
 			EndIf
 			;inter-text
-			If LanguageShow = "MYANMAR" Then 
+			If LanguageShow = "MYANMAR" Then
 				Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
 			EndIf
-			If LanguageShow = "MSC" Then 
+			If LanguageShow = "MSC" Then
 				Var MachineErrorDetailAll = " 按按钮取杯子。"
 			EndIf
-			If LanguageShow = "MTC" Then 
+			If LanguageShow = "MTC" Then
 				Var MachineErrorDetailAll = " 按按鈕取杯子。"
 			EndIf
 		EndIf
 	EndIf
 
+    If Timeout2 < 3 Then
+    	Var MachineErrorDetailAll = "..."
+    EndIf
 
 	DEBUGVAR MenuReadyForCup
 
 	If MenuReadyForCup = "YES" Then
 
 		If DoorCupPosition = "bottom" Then
-			
+
 			Var VideoPlayFile = VideoPath
 			Var VideoPlayFile = VideoPlayFile + VideoFileBegin
 			Var VideoPlayFile = VideoPlayFile + "1"
@@ -456,9 +464,9 @@
 
 			DEBUGVAR CountDownForShowMenuNextOrderToBrew
 			DEBUGVAR Seeker.selected_a_drink
-			
+
 			If CountDownForShowMenuNextOrderToBrew = 3 Then
-			
+
 			EndIf
 
 
@@ -477,7 +485,7 @@
 		Var buttonRemoveCup = "Invisible"
 
 	Else
-		
+
 
 	EndIf