diff --git a/xml/page_brewing3Multi.xml b/xml/page_brewing3Multi.xml
index d38482f7..80e92b99 100644
--- a/xml/page_brewing3Multi.xml
+++ b/xml/page_brewing3Multi.xml
@@ -485,7 +485,9 @@
 	EndIf
 
 
-	
+	If MachineState_Result = 1 Then
+		Var MachineState_Result = 2
+	EndIf
 		
 
 	If MachineState_Result = 1 Then
@@ -605,7 +607,9 @@
 						If StoreCreditFlag = 1 Then
 							Var ChangeOK = 2
 						Else	
-							Change ServiceAmount2		
+							;Change ServiceAmount2	
+							Var ChangeAmountSum = ChangeAmountSum + ServiceAmount2
+							Var ChangeOK = 2
 						EndIf
 								
 					EndIf
@@ -620,7 +624,9 @@
 							If StoreCreditFlag = 1 Then
 								Var ChangeOK = 2
 							Else
-								Change ServiceAmount3
+								;Change ServiceAmount3
+								Var ChangeAmountSum = ChangeAmountSum + ServiceAmount3
+								Var ChangeOK = 2
 							EndIf
 							
 						EndIf
diff --git a/xml/page_drinkfail2Multi.xml b/xml/page_drinkfail2Multi.xml
index dece5d36..c9aff234 100644
--- a/xml/page_drinkfail2Multi.xml
+++ b/xml/page_drinkfail2Multi.xml
@@ -104,7 +104,7 @@
 
 
 	SAVELOG next_ready
-
+	Var next_ready = "false"
 
 	Var MultiGo = 1
 
@@ -147,7 +147,7 @@
 						If StoreCreditFlag = 1 Then
 							
 						Else	
-							Change ServiceAmount2	
+							Var ChangeAmountSum = ChangeAmountSum + ServiceAmount2
 							Var MultiGo = 0	
 						EndIf
 				EndIf
@@ -189,7 +189,7 @@
 						If StoreCreditFlag = 1 Then
 							
 						Else	
-							Change ServiceAmount2	
+							Var ChangeAmountSum = ChangeAmountSum + ServiceAmount2
 							Var MultiGo = 0		
 						EndIf
 				EndIf
@@ -202,6 +202,13 @@
 	EndIf
 
 
+	If 	CART_INDEX = CART_COUNT  Then 
+		If ChangeAmountSum > 0 Then
+			Change ChangeAmountSum
+			Var MultiGo = 0 
+		EndIf
+	EndIf
+	
 
 	
 </EventOpen>
diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml
index a56746f5..5d4f0c6d 100644
--- a/xml/page_drinkok.xml
+++ b/xml/page_drinkok.xml
@@ -107,10 +107,42 @@
 	EndIf
 
 
+	Var MultiGo = 1 
+
+
 		If CART_COUNT = 0 Then
 			Var sendPayMultiFlag = 1
 		Else
+
 			If 	CART_INDEX = CART_COUNT  Then  
+				If ChangeAmountSum > 0 Then
+					Change ChangeAmountSum
+					Var MultiGo = 0 
+				EndIf
+			EndIf
+			
+		EndIf 
+	
+
+
+
+</EventOpen>
+<Timeout> 500 </Timeout>
+<EventTimeout> 
+
+	DEBUGVAR MachineStage
+	DEBUGVAR CupOnArm
+	DEBUGVAR buttonRemoveCup
+	DEBUGVAR CART_COUNT
+
+	Var Timeout = Timeout + 1
+
+	If Timeout > 5 Then
+		Var MultiGo = 1 
+	EndIf
+
+	If MultiGo = 1 Then
+		If 	CART_INDEX = CART_COUNT  Then  
 
 				;Pay Multi
 				If sendPayMultiFlag = 0 Then
@@ -148,21 +180,10 @@
 						
 					Var sendPayMultiFlag = 1
 				EndIf
-			EndIf
-		EndIf 
-	
+		EndIf
+	EndIf
 
 
-
-</EventOpen>
-<Timeout> 500 </Timeout>
-<EventTimeout> 
-
-	DEBUGVAR MachineStage
-	DEBUGVAR CupOnArm
-	DEBUGVAR buttonRemoveCup
-	DEBUGVAR CART_COUNT
-
 	If HaveCup = "false" Then
 
 		If MachineStage = "show-menu" Then
@@ -223,7 +244,7 @@
 		EndIf
 	EndIf
 
-	Var Timeout = Timeout + 1
+	
 
 	TimerReset
 	Refresh
diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml
index d169acab..a1e1f825 100644
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@@ -25,6 +25,7 @@
 	Var MachineState_Result = 0
 
 	Var FailedCount = 0
+	Var ChangeAmountSum = 0
 	
 
 	If show_eng = "true" Then