diff --git a/animation01/TaoBin2_draft02_art14.mp4 b/animation01/TaoBin2_draft02_art14.mp4
index 8199180c..5cb46434 100644
Binary files a/animation01/TaoBin2_draft02_art14.mp4 and b/animation01/TaoBin2_draft02_art14.mp4 differ
diff --git a/animation01/TaoBin2_draft02_art24_.mp4 b/animation01/TaoBin2_draft02_art24_.mp4
deleted file mode 100644
index b4fb67ac..00000000
Binary files a/animation01/TaoBin2_draft02_art24_.mp4 and /dev/null differ
diff --git a/animation01/sync_1.file b/animation01/sync_1.file
index 7c01f8d7..59466c32 100644
--- a/animation01/sync_1.file
+++ b/animation01/sync_1.file
@@ -1,9 +1,11 @@
+total 202904
+-rw-rw---- 1 root sdcard_rw    21318 2022-07-01 11:09 6.png
 -rw-rw---- 1 root sdcard_rw   948282 2020-11-15 19:54 TaoBin2_draft02_art1.mp4
 -rw-rw---- 1 root sdcard_rw  3603060 2020-11-15 20:03 TaoBin2_draft02_art10.mp4
 -rw-rw---- 1 root sdcard_rw  3166935 2020-11-15 20:03 TaoBin2_draft02_art11.mp4
 -rw-rw---- 1 root sdcard_rw  2523981 2020-11-15 20:04 TaoBin2_draft02_art12.mp4
 -rw-rw---- 1 root sdcard_rw  3033922 2020-11-15 20:04 TaoBin2_draft02_art13.mp4
--rw-rw---- 1 root sdcard_rw  1504005 2020-11-15 20:05 TaoBin2_draft02_art14.mp4
+-rw-rw---- 1 root sdcard_rw  1491515 2022-08-24 16:10 TaoBin2_draft02_art14.mp4
 -rw-rw---- 1 root sdcard_rw  3485911 2020-11-15 20:05 TaoBin2_draft02_art15.mp4
 -rw-rw---- 1 root sdcard_rw  3116323 2020-11-15 20:05 TaoBin2_draft02_art16.mp4
 -rw-rw---- 1 root sdcard_rw  3221745 2020-11-15 20:06 TaoBin2_draft02_art17.mp4
@@ -14,7 +16,8 @@
 -rw-rw---- 1 root sdcard_rw  1495680 2020-11-15 20:07 TaoBin2_draft02_art21.mp4
 -rw-rw---- 1 root sdcard_rw  1469930 2020-11-15 20:07 TaoBin2_draft02_art22.mp4
 -rw-rw---- 1 root sdcard_rw  1920522 2020-11-15 20:08 TaoBin2_draft02_art23.mp4
--rw-rw---- 1 root sdcard_rw  1319272 2021-11-19 00:07 TaoBin2_draft02_art24.mp4
+-rw-rw---- 1 root sdcard_rw  2569104 2022-06-06 17:55 TaoBin2_draft02_art24.mp4
+-rw-rw---- 1 root sdcard_rw  1319272 2021-11-19 00:07 TaoBin2_draft02_art24_.mp4
 -rw-rw---- 1 root sdcard_rw  2879806 2020-12-05 21:17 TaoBin2_draft02_art25.mp4
 -rw-rw---- 1 root sdcard_rw  3161811 2020-12-05 21:18 TaoBin2_draft02_art26.mp4
 -rw-rw---- 1 root sdcard_rw  5410752 2020-12-15 14:22 TaoBin2_draft02_art27.mp4
@@ -36,8 +39,120 @@
 -rw-rw---- 1 root sdcard_rw 11954724 2021-12-14 11:13 TaoBin2_draft02_art45.mp4
 -rw-rw---- 1 root sdcard_rw  2273091 2022-01-17 10:49 TaoBin2_draft02_art46.mp4
 -rw-rw---- 1 root sdcard_rw 10876491 2022-01-05 10:53 TaoBin2_draft02_art47.mp4
+-rw-rw---- 1 root sdcard_rw 11216148 2022-02-08 09:34 TaoBin2_draft02_art48.mp4
+-rw-rw---- 1 root sdcard_rw 11257314 2022-04-21 22:48 TaoBin2_draft02_art49.mp4
 -rw-rw---- 1 root sdcard_rw  2041924 2020-11-16 00:25 TaoBin2_draft02_art5.mp4
+-rw-rw---- 1 root sdcard_rw 10029716 2022-05-19 14:11 TaoBin2_draft02_art50.mp4
+-rw-rw---- 1 root sdcard_rw  2630275 2022-05-19 14:08 TaoBin2_draft02_art51.mp4
+-rw-rw---- 1 root sdcard_rw  1593497 2022-06-29 16:47 TaoBin2_draft02_art52.mp4
+-rw-rw---- 1 root sdcard_rw  1647365 2022-06-29 16:47 TaoBin2_draft02_art53.mp4
 -rw-rw---- 1 root sdcard_rw  3843048 2020-11-15 20:18 TaoBin2_draft02_art6.mp4
 -rw-rw---- 1 root sdcard_rw  3740266 2020-11-15 19:57 TaoBin2_draft02_art7.mp4
 -rw-rw---- 1 root sdcard_rw  3998856 2020-11-15 20:01 TaoBin2_draft02_art8.mp4
 -rw-rw---- 1 root sdcard_rw  3616423 2020-11-15 20:01 TaoBin2_draft02_art9.mp4
+-rw-rw---- 1 root sdcard_rw    34923 2022-07-01 11:23 image_bottom1.png
+-rw-rw---- 1 root sdcard_rw     5473 2022-07-01 11:23 img2.png
+-rw-rw---- 1 root sdcard_rw     4680 2022-07-01 11:23 img2_eng.png
+-rw-rw---- 1 root sdcard_rw    29903 2022-07-04 15:28 play_list.tsv
+-rw-rw---- 1 root sdcard_rw        0 2022-08-28 21:47 sync_1.file
+-rw-rw---- 1 root sdcard_rw     3905 2022-04-26 17:47 sync_2.file
+-rw-rw---- 1 root sdcard_rw     4236 2022-06-06 16:36 sync_3.file
+-rw-rw---- 1 root sdcard_rw    11118 2022-07-02 19:12 sync_4.file
+-rw-rw---- 1 root sdcard_rw    11118 2022-07-05 12:07 sync_5.file
+-rw-rw---- 1 root sdcard_rw     7660 2022-07-01 11:23 text1.png
+-rw-rw---- 1 root sdcard_rw    49135 2022-07-01 11:23 text2.png
+-rw-rw---- 1 root sdcard_rw    39922 2022-07-01 11:23 text_bottom_eng.png
+-rw-rw---- 1 root sdcard_rw    35163 2022-07-01 11:23 text_bottom_thai.png
+-rw-rw---- 1 root sdcard_rw    34960 2022-07-01 11:23 text_bottom_thai2.png
+-rw-rw---- 1 root sdcard_rw    32061 2022-07-01 11:23 txt_1.png
+-rw-rw---- 1 root sdcard_rw    18549 2022-07-01 11:23 txt_10.png
+-rw-rw---- 1 root sdcard_rw    18335 2022-07-01 11:23 txt_10_en.png
+-rw-rw---- 1 root sdcard_rw    24992 2022-07-01 11:23 txt_11.png
+-rw-rw---- 1 root sdcard_rw    23868 2022-07-01 11:23 txt_11_en.png
+-rw-rw---- 1 root sdcard_rw    22395 2022-07-01 11:23 txt_12.png
+-rw-rw---- 1 root sdcard_rw    20037 2022-07-01 11:23 txt_12_en.png
+-rw-rw---- 1 root sdcard_rw    23171 2022-07-01 11:23 txt_13.png
+-rw-rw---- 1 root sdcard_rw    24728 2022-07-01 11:23 txt_13_en.png
+-rw-rw---- 1 root sdcard_rw    23644 2022-07-01 11:23 txt_14.png
+-rw-rw---- 1 root sdcard_rw    22085 2022-07-01 11:23 txt_14_en.png
+-rw-rw---- 1 root sdcard_rw    20734 2022-07-01 11:23 txt_15.png
+-rw-rw---- 1 root sdcard_rw    21447 2022-07-01 11:23 txt_15_en.png
+-rw-rw---- 1 root sdcard_rw    21304 2022-07-01 11:23 txt_16.png
+-rw-rw---- 1 root sdcard_rw    23166 2022-07-01 11:23 txt_16_en.png
+-rw-rw---- 1 root sdcard_rw    20229 2022-07-01 11:23 txt_17.png
+-rw-rw---- 1 root sdcard_rw    20068 2022-07-01 11:23 txt_17_en.png
+-rw-rw---- 1 root sdcard_rw    24904 2022-07-01 11:23 txt_18.png
+-rw-rw---- 1 root sdcard_rw    20747 2022-07-01 11:23 txt_18_en.png
+-rw-rw---- 1 root sdcard_rw    28389 2022-07-01 11:23 txt_19.png
+-rw-rw---- 1 root sdcard_rw    25617 2022-07-01 11:23 txt_19_en.png
+-rw-rw---- 1 root sdcard_rw    34020 2022-07-01 11:23 txt_1_en.png
+-rw-rw---- 1 root sdcard_rw    28949 2022-07-01 11:23 txt_2.png
+-rw-rw---- 1 root sdcard_rw    26853 2022-07-01 11:23 txt_20.png
+-rw-rw---- 1 root sdcard_rw    24455 2022-07-01 11:23 txt_20_en.png
+-rw-rw---- 1 root sdcard_rw    25258 2022-07-01 11:23 txt_21.png
+-rw-rw---- 1 root sdcard_rw    23722 2022-07-01 11:23 txt_21_en.png
+-rw-rw---- 1 root sdcard_rw    24050 2022-07-01 11:23 txt_22.png
+-rw-rw---- 1 root sdcard_rw    26467 2022-07-01 11:23 txt_22_en.png
+-rw-rw---- 1 root sdcard_rw    22771 2022-07-01 11:23 txt_23.png
+-rw-rw---- 1 root sdcard_rw    17516 2022-07-01 11:23 txt_23_en.png
+-rw-rw---- 1 root sdcard_rw    28030 2022-07-01 11:23 txt_25.png
+-rw-rw---- 1 root sdcard_rw    29867 2022-07-01 11:23 txt_25_en.png
+-rw-rw---- 1 root sdcard_rw    24099 2022-07-01 11:23 txt_26.png
+-rw-rw---- 1 root sdcard_rw    23135 2022-07-01 11:23 txt_26_en.png
+-rw-rw---- 1 root sdcard_rw    33954 2022-07-01 11:23 txt_2_en.png
+-rw-rw---- 1 root sdcard_rw    21171 2022-07-01 11:23 txt_3.png
+-rw-rw---- 1 root sdcard_rw    25362 2022-07-01 11:23 txt_31.png
+-rw-rw---- 1 root sdcard_rw    23964 2022-07-01 11:23 txt_31_en.png
+-rw-rw---- 1 root sdcard_rw    23174 2022-07-01 11:23 txt_32.png
+-rw-rw---- 1 root sdcard_rw    24719 2022-07-01 11:23 txt_32_en.png
+-rw-rw---- 1 root sdcard_rw    24190 2022-07-01 11:23 txt_33.png
+-rw-rw---- 1 root sdcard_rw    22246 2022-07-01 11:23 txt_33_en.png
+-rw-rw---- 1 root sdcard_rw    27359 2022-07-01 11:23 txt_34.png
+-rw-rw---- 1 root sdcard_rw    22302 2022-07-01 11:23 txt_34_en.png
+-rw-rw---- 1 root sdcard_rw    22812 2022-07-01 11:23 txt_35.png
+-rw-rw---- 1 root sdcard_rw    22285 2022-07-01 11:23 txt_35_en.png
+-rw-rw---- 1 root sdcard_rw    34780 2022-07-01 11:23 txt_36.png
+-rw-rw---- 1 root sdcard_rw    33707 2022-07-01 11:23 txt_36_en.png
+-rw-rw---- 1 root sdcard_rw    21847 2022-07-01 11:23 txt_37.png
+-rw-rw---- 1 root sdcard_rw    22144 2022-07-01 11:23 txt_37_en.png
+-rw-rw---- 1 root sdcard_rw    23308 2022-07-01 11:23 txt_3_en.png
+-rw-rw---- 1 root sdcard_rw    17562 2022-07-01 11:23 txt_4.png
+-rw-rw---- 1 root sdcard_rw    25925 2022-07-01 11:23 txt_40.png
+-rw-rw---- 1 root sdcard_rw    29796 2022-07-01 11:23 txt_40_en.png
+-rw-rw---- 1 root sdcard_rw    27625 2022-07-01 11:23 txt_41.png
+-rw-rw---- 1 root sdcard_rw    27415 2022-07-01 11:23 txt_41_en.png
+-rw-rw---- 1 root sdcard_rw    33251 2022-07-01 11:23 txt_42.png
+-rw-rw---- 1 root sdcard_rw    33734 2022-07-01 11:23 txt_42_en.png
+-rw-rw---- 1 root sdcard_rw    42700 2022-07-01 11:23 txt_43.png
+-rw-rw---- 1 root sdcard_rw    35567 2022-07-01 11:23 txt_43_en.png
+-rw-rw---- 1 root sdcard_rw    18419 2022-07-01 11:23 txt_44.png
+-rw-rw---- 1 root sdcard_rw    37091 2022-07-01 11:23 txt_44_en.png
+-rw-rw---- 1 root sdcard_rw    39388 2022-07-01 11:23 txt_45.png
+-rw-rw---- 1 root sdcard_rw    40946 2022-07-01 11:23 txt_45_en.png
+-rw-rw---- 1 root sdcard_rw    24705 2022-07-01 11:23 txt_46.png
+-rw-rw---- 1 root sdcard_rw    27055 2022-07-01 11:23 txt_46_en.png
+-rw-rw---- 1 root sdcard_rw    36845 2022-07-01 11:23 txt_47.png
+-rw-rw---- 1 root sdcard_rw    37112 2022-07-01 11:23 txt_47_en.png
+-rw-rw---- 1 root sdcard_rw    39786 2022-07-01 11:23 txt_48.png
+-rw-rw---- 1 root sdcard_rw    41312 2022-07-01 11:23 txt_48_en.png
+-rw-rw---- 1 root sdcard_rw    37113 2022-07-01 11:23 txt_49.png
+-rw-rw---- 1 root sdcard_rw    27060 2022-07-01 11:23 txt_49_en.png
+-rw-rw---- 1 root sdcard_rw    23513 2022-07-01 11:23 txt_4_en.png
+-rw-rw---- 1 root sdcard_rw    24655 2022-07-01 11:23 txt_5.png
+-rw-rw---- 1 root sdcard_rw    33184 2022-07-01 11:23 txt_50.png
+-rw-rw---- 1 root sdcard_rw    38394 2022-07-01 11:23 txt_50_en.png
+-rw-rw---- 1 root sdcard_rw    33426 2022-07-01 11:23 txt_51.png
+-rw-rw---- 1 root sdcard_rw    30156 2022-07-01 11:23 txt_51_en.png
+-rw-rw---- 1 root sdcard_rw    25190 2022-07-01 11:23 txt_52.png
+-rw-rw---- 1 root sdcard_rw    23394 2022-07-01 11:23 txt_52_en.png
+-rw-rw---- 1 root sdcard_rw    25234 2022-07-01 11:23 txt_53.png
+-rw-rw---- 1 root sdcard_rw    22382 2022-07-01 11:23 txt_53_en.png
+-rw-rw---- 1 root sdcard_rw    32717 2022-07-01 11:23 txt_5_en.png
+-rw-rw---- 1 root sdcard_rw    15158 2022-07-01 11:23 txt_6.png
+-rw-rw---- 1 root sdcard_rw    17589 2022-07-01 11:23 txt_6_en.png
+-rw-rw---- 1 root sdcard_rw    20203 2022-07-01 11:23 txt_7.png
+-rw-rw---- 1 root sdcard_rw    20068 2022-07-01 11:23 txt_7_en.png
+-rw-rw---- 1 root sdcard_rw    20339 2022-07-01 11:23 txt_8.png
+-rw-rw---- 1 root sdcard_rw    21965 2022-07-01 11:23 txt_8_en.png
+-rw-rw---- 1 root sdcard_rw    19244 2022-07-01 11:23 txt_9.png
+-rw-rw---- 1 root sdcard_rw    19707 2022-07-01 11:23 txt_9_en.png
diff --git a/animation01/sync_5.file b/animation01/sync_5.file
index 63d7815f..59466c32 100644
--- a/animation01/sync_5.file
+++ b/animation01/sync_5.file
@@ -1,11 +1,11 @@
-total 202908
+total 202904
 -rw-rw---- 1 root sdcard_rw    21318 2022-07-01 11:09 6.png
 -rw-rw---- 1 root sdcard_rw   948282 2020-11-15 19:54 TaoBin2_draft02_art1.mp4
 -rw-rw---- 1 root sdcard_rw  3603060 2020-11-15 20:03 TaoBin2_draft02_art10.mp4
 -rw-rw---- 1 root sdcard_rw  3166935 2020-11-15 20:03 TaoBin2_draft02_art11.mp4
 -rw-rw---- 1 root sdcard_rw  2523981 2020-11-15 20:04 TaoBin2_draft02_art12.mp4
 -rw-rw---- 1 root sdcard_rw  3033922 2020-11-15 20:04 TaoBin2_draft02_art13.mp4
--rw-rw---- 1 root sdcard_rw  1504005 2020-11-15 20:05 TaoBin2_draft02_art14.mp4
+-rw-rw---- 1 root sdcard_rw  1491515 2022-08-24 16:10 TaoBin2_draft02_art14.mp4
 -rw-rw---- 1 root sdcard_rw  3485911 2020-11-15 20:05 TaoBin2_draft02_art15.mp4
 -rw-rw---- 1 root sdcard_rw  3116323 2020-11-15 20:05 TaoBin2_draft02_art16.mp4
 -rw-rw---- 1 root sdcard_rw  3221745 2020-11-15 20:06 TaoBin2_draft02_art17.mp4
@@ -54,11 +54,11 @@ total 202908
 -rw-rw---- 1 root sdcard_rw     5473 2022-07-01 11:23 img2.png
 -rw-rw---- 1 root sdcard_rw     4680 2022-07-01 11:23 img2_eng.png
 -rw-rw---- 1 root sdcard_rw    29903 2022-07-04 15:28 play_list.tsv
--rw-rw---- 1 root sdcard_rw     3431 2022-01-17 11:20 sync_1.file
+-rw-rw---- 1 root sdcard_rw        0 2022-08-28 21:47 sync_1.file
 -rw-rw---- 1 root sdcard_rw     3905 2022-04-26 17:47 sync_2.file
 -rw-rw---- 1 root sdcard_rw     4236 2022-06-06 16:36 sync_3.file
 -rw-rw---- 1 root sdcard_rw    11118 2022-07-02 19:12 sync_4.file
--rw-rw---- 1 root sdcard_rw        0 2022-07-05 12:07 sync_5.file
+-rw-rw---- 1 root sdcard_rw    11118 2022-07-05 12:07 sync_5.file
 -rw-rw---- 1 root sdcard_rw     7660 2022-07-01 11:23 text1.png
 -rw-rw---- 1 root sdcard_rw    49135 2022-07-01 11:23 text2.png
 -rw-rw---- 1 root sdcard_rw    39922 2022-07-01 11:23 text_bottom_eng.png
diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml
index 43b28bec..aa965798 100644
--- a/xml/page_drinkok.xml
+++ b/xml/page_drinkok.xml
@@ -188,6 +188,7 @@
 	DEBUGVAR NextOrder
 	DEBUGVAR DoorCupPosition
 
+
 	Var Timeout = Timeout + 1
 
 	; Timeout 10*60*2
@@ -381,29 +382,34 @@
 
 						; next order set. Havecup and checkup value must false. Certain cup not on any arm.
 
-					
-						If HaveCup = "false" Then 
-							If MaybeHaveCup = "true" Then
+						If PaySuccessWithDaemonTask = 1 Then
+								Var NextOrder = "false"
+								SAVELOG "Make next order by pass"
+								Open "ROOT/taobin_project/xml/page_thankyouConti.xml" 
+						Else
+							If HaveCup = "false" Then 
+								If MaybeHaveCup = "true" Then
 
-							Else
-								If CupChecking = "true" Then
-									
 								Else
-									If CupOnArm = "false" Then 
+									If CupChecking = "true" Then
 										
-										If DoorCupPosition = "bottom" Then
-											; BEGIN
-											Var NextOrder = "false"
+									Else
+										If CupOnArm = "false" Then 
+											
+											If DoorCupPosition = "bottom" Then
+												; BEGIN
+												Var NextOrder = "false"
 
-											TransferVar "next" "curr"
-											Var Seeker = "curr"
-											SAVELOG "Make next order by take-cup"
-											Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
-											; END
+												TransferVar "next" "curr"
+												Var Seeker = "curr"
+												SAVELOG "Make next order by take-cup"
+												Open "ROOT/taobin_project/xml/page_thankyouConti.xml" 
+												; END
 
-										Else 
-											Machine DoorClose
-										EndIf 
+											Else 
+												Machine DoorClose
+											EndIf 
+										EndIf
 									EndIf
 								EndIf
 							EndIf
@@ -461,8 +467,7 @@
 		EndIf
 	EndIf
 
-
-
+	
 	If MachineStage = "close-maintenance" Then
 		If stop_now = "true" Then
 			If  NextOrder = "true" Then
diff --git a/xml/page_main_blank.xml b/xml/page_main_blank.xml
index eb645588..69da80b9 100644
--- a/xml/page_main_blank.xml
+++ b/xml/page_main_blank.xml
@@ -22,34 +22,42 @@
 
 		If PaidPaymentFromNextStage = 2 Then
 			DEBUGVAR HaveCup
-			DEBUGVAR MachineStage
+			DEBUGVAR MaybeHaveCup
 			DEBUGVAR DoorCupPosition
+			
 			If HaveCup = "false" Then
-				If DoorCupPosition = "bottom" Then
+				If MaybeHaveCup = "false" Then
+					If DoorCupPosition = "bottom" Then
 
-					Topping "Select" next.UserSelectDrinkFromPaid
+						Topping "Select" NextUserSelectDrinkFromPaid
 
-					; Set option toppinng and pack 
-					Topping "Select1-ID" next.UserSelecttopping1Paid
-					Topping "Select2-ID" next.UserSelecttopping2Paid
-					Topping "Select3-ID" next.UserSelecttopping3Paid
+						; Set option toppinng and pack 
+						Topping "Select1-ID" NextUserSelecttopping1Paid
+						Topping "Select2-ID" NextUserSelecttopping2Paid
+						Topping "Select3-ID" NextUserSelecttopping3Paid
 
-					; Pack
-					Topping "Pack" ExtendDataCurr
+						; Pack
+						Topping "Pack" ExtendDataCurr
 
-					Var DelayForMakeDrink = 2
-					Var PaidPaymentFromNextStage = 3
+						Var DelayForMakeDrink = 2
+						Var PaidPaymentFromNextStage = 3
+
+						DEBUGVAR NextUserSelectDrinkFromPaid
+					EndIf
 				EndIf
 			EndIf
 		EndIf
+	
+		DEBUGVAR DelayForMakeDrink
+	
 	EndIf
 	
-	DEBUGVAR DelayForMakeDrink
-	If DelayForMakeDrink > 3 Then
+	If DelayForMakeDrink > 0 Then
 		DEBUGVAR DelayForMakeDrink
 		Var DelayForMakeDrink = DelayForMakeDrink - 1
 		If DelayForMakeDrink = 0 Then
-			MakeDrinkV1  SelectDrink SelectSugarID
+			Var MakeContinue = 1
+			MakeDrinkV1  NextUserSelectDrinkFromPaid SelectSugarID
 		EndIf
 	EndIf
 
diff --git a/xml/page_payment.xml b/xml/page_payment.xml
index a2a3257d..e8d12605 100644
--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@@ -131,7 +131,7 @@
 	
 	If AdultFlag = 1 Then
 		If CameraCount = 1 Then
-			CameraSetting "usbfront" "default" "Rotate=270,Resolution=1280x720,scaleX=1.0,scaleY=1.0"
+			CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=1.0"
 		EndIf
 
 		 Var PlaySoundLag = ""
diff --git a/xml/page_payment_camera.xml b/xml/page_payment_camera.xml
index b50ac8a7..e169e17f 100644
--- a/xml/page_payment_camera.xml
+++ b/xml/page_payment_camera.xml
@@ -234,7 +234,7 @@
 
 <Button>
 <X> 689 </X>
-<Y> 1050 </Y>
+<Y> 885 </Y>
 <State> "Enable" </State>
 <Filename> Var( DirImage + "/img_popup6.png" )</Filename>
 <EventClick> 
@@ -249,7 +249,7 @@
 
 <CameraX> 
 <X> 735 </X>
-<Y> 1374 </Y>
+<Y> 1189 </Y>
 <Name>"usbfront"</Name>
 <Width> 326 </Width>
 <Height> 235 </Height>
diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml
index 6ca18b06..e7004853 100644
--- a/xml/page_thankyouConti.xml
+++ b/xml/page_thankyouConti.xml
@@ -49,18 +49,18 @@
 		Var BottomText = PicturePath + "text_bottom_thai2.png"
 	EndIf
 
-	DEBUGVAR StarwState
-	DEBUGVAR LidState
+	;DEBUGVAR StarwState
+	;DEBUGVAR LidState
 	DEBUGVAR BottomText
 
-	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
+	;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
 
 
 	DEBUGVAR Seeker.TNumberTaobinCredit
@@ -74,30 +74,34 @@
     	SAVELOG "Call from thankyou Conti"
     	
 
-    	If Seeker.get_a_straw  = "Press" Then
-			Machine StrawOrder	
-			Var LedLidBlink = "true"
-			Var SaveTheWorldCount = SaveTheWorldCount + 1
+    	If PaySuccessWithDaemonTask = 1 Then
+
+    	Else
+	    	If Seeker.get_a_straw  = "Press" Then
+				Machine StrawOrder	
+				Var LedLidBlink = "true"
+				Var SaveTheWorldCount = SaveTheWorldCount + 1
+			EndIf
+
+			If Seeker.get_a_lid = "Press" Then
+				Machine LidOrder	
+				Var LedLidBlink = "true"
+				Var SaveTheWorldCount = SaveTheWorldCount + 1
+			EndIf
+
+			Topping "Select" Seeker.selected_a_drink
+
+			; Set option toppinng and pack 
+			Topping "Select1-ID" Seeker.topping1
+			Topping "Select2-ID" Seeker.topping2
+			Topping "Select3-ID" Seeker.topping3
+
+			; Pack
+			Topping "Pack" ExtendDataCurr
+
+
+			Topping "ClearNextOrder" "-"
 		EndIf
-
-		If Seeker.get_a_lid = "Press" Then
-			Machine LidOrder	
-			Var LedLidBlink = "true"
-			Var SaveTheWorldCount = SaveTheWorldCount + 1
-		EndIf
-
-		Topping "Select" Seeker.selected_a_drink
-
-		; Set option toppinng and pack 
-		Topping "Select1-ID" Seeker.topping1
-		Topping "Select2-ID" Seeker.topping2
-		Topping "Select3-ID" Seeker.topping3
-
-		; Pack
-		Topping "Pack" ExtendDataCurr
-
-
-		Topping "ClearNextOrder" "-"
 	EndIf
 
 
@@ -132,6 +136,27 @@
 	DEBUGVAR DoorCupPosition
 	DEBUGVAR CountUpDoorCupOpen
 
+	DEBUGVAR MakeContinue
+	If PaySuccessWithDaemonTask = 1 Then
+		If MakeContinue = 1 Then
+			Var MakeContinue = 0
+			Var Ignore
+			Var NextOrder = "false"
+
+			TransferVar "next" "curr"
+			Var Seeker = "curr"
+			SAVELOG "go to next order by MakeContinue = 1"
+
+			Var CountDownBrewing = BrewTime
+			Var CountUpBrewing = 0
+			SAVELOG BrewTime
+			Var ShowCountDownBrewing = CountDownBrewing
+
+			Open "ROOT/taobin_project/xml/page_brewing3.xml"
+		EndIf
+	EndIf
+
+
 	If HaveCup = "true" Then
 		Var Timeout = 0
 	Else 
diff --git a/xml/page_topping_select4.xml b/xml/page_topping_select4.xml
index 612600a5..3ba352f1 100644
--- a/xml/page_topping_select4.xml
+++ b/xml/page_topping_select4.xml
@@ -2327,10 +2327,10 @@
 		; Pack
 		Topping "__pack" ExtendDataNext
 
-		next.UserSelectDrinkFromPaid = UserSelectProductCode
-		next.UserSelecttopping1Paid = topping1
-		next.UserSelecttopping2Paid = topping2
-		next.UserSelecttopping3Paid = topping3
+		Var NextUserSelectDrinkFromPaid = UserSelectProductCode
+		Var NextUserSelecttopping1Paid = topping1
+		Var NextUserSelecttopping2Paid = topping2
+		Var NextUserSelecttopping3Paid = topping3
 
 
 
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index dac3dcf2..8187ec19 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -8,6 +8,17 @@
 <Background> "/ROOT/pictures/startup.bmp" </Background>
 <Timeout> 3000 </Timeout>
 <EventTimeout> 
+
+	CameraService "filter-remove-all"
+	CameraService "add-filter=mClass=9,mSubclass=4"
+	CameraService "add-filter=USB Camera"
+	
+	CameraService "Start"
+
+	If JXMLVersionInt > 409 Then
+		FlushTxRef1
+	EndIf
+
 	Open "/ROOT/xml/main.xml" 
 </EventTimeout>
 <EventOpen>