Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -r13a064292b5a36a85593f53eabae268ae2bf4bc6 -r8639aa012127798aeb8fd719dd7f93b83275f944
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 13a064292b5a36a85593f53eabae268ae2bf4bc6)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 8639aa012127798aeb8fd719dd7f93b83275f944)
@@ -39,12 +39,11 @@
 // ********** private definitions **********
 
 #define DEFAULT_RINSEBACK_VOLUME_ML                 300.0F                  ///< Default rinseback volume (in mL).
-#define MAX_TOTAL_ADDITIONAL_RINSEBACK_VOLUME_ML    300.0F                  ///< Maximum total additional rinseback volume allowed : all additionals (in mL).
 #define TARGET_ADDITIONAL_RINSEBACK_VOLUME_ML        50.0F                  ///< Target rinseback volume for an additional volume request (in mL).
 #define RINSEBACK_FLOW_RATE_ADJ_ML_MIN               25                     ///< Adjustment amount (in mL/min) to apply when user requests increase/decrease in flow rate.
 #define DEFAULT_RINSEBACK_FLOW_RATE_ML_MIN          250                     ///< Default rinseback flow rate (in mL/min).
 #define MIN_RINSEBACK_FLOW_RATE_ML_MIN              100                     ///< Minimum rinseback flow rate (in mL/min).
-#define MAX_RINSEBACK_FLOW_RATE_ML_MIN              300                     ///< Maximum rinseback flow rate (in mL/min).
+#define MAX_RINSEBACK_FLOW_RATE_ML_MIN              500                     ///< Maximum rinseback flow rate (in mL/min).
 #define DEFAULT_FILL_RESERVOIR_TO_VOLUME_ML         1500                    ///< default Fill reservoir to this volume (in mL).
 
 /// Interval at which rinseback progress is to be published to UI.
@@ -602,9 +601,8 @@
         targetRinsebackVolumePlusAdditional_mL = getRinsebackVolume();
         result = RINSEBACK_STOP_STATE;
     }
-    // Has additional rinseback completed or max additional volume reached
-    else if ( ( additionalRinsebackVolume_mL >= TARGET_ADDITIONAL_RINSEBACK_VOLUME_ML ) ||
-              ( totalAdditionalRinsebackVolume_mL >=  MAX_TOTAL_ADDITIONAL_RINSEBACK_VOLUME_ML ) )
+    // Has additional rinseback completed
+    else if ( additionalRinsebackVolume_mL >= TARGET_ADDITIONAL_RINSEBACK_VOLUME_ML )
     {
         result = RINSEBACK_STOP_STATE;
     }
@@ -687,6 +685,7 @@
  *************************************************************************/
 void signalRinsebackUserAction( REQUESTED_RINSEBACK_USER_ACTIONS_T action )
 {
+    GENERIC_CONFIRMATION_REQUEST_T genericConfRequest;
     BOOL accepted = FALSE;
     REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NONE;
 
@@ -728,8 +727,16 @@
                 break;
 
             case REQUESTED_USER_ACTION_RINSEBACK_END_TREATMENT:
+                genericConfRequest.requestID       = (U32)GENERIC_CONFIRM_ID_TREATMENT_END;
+                genericConfRequest.requestType     = (U32)GENERIC_CONFIRM_CMD_REQUEST_OPEN;
+                genericConfRequest.rejectReason    = 0;
+                genericConfRequest.genericPayload1 = 0.0F;
+                genericConfRequest.genericPayload2 = 0.0F;
+                genericConfRequest.genericPayload3 = 0.0F;
+                genericConfRequest.genericPayload4 = 0.0F;
+
                 // Send message to UI to get user confirmation to end treatment - action initiated only upon receipt of user confirmation from UI
-                addConfirmationRequest( GENERIC_CONFIRM_ID_TREATMENT_END, GENERIC_CONFIRM_CMD_REQUEST_OPEN, 0 );
+                addConfirmationRequest( &genericConfRequest );
                 accepted = TRUE;
                 break;
 
@@ -950,15 +957,7 @@
 
     if ( RINSEBACK_STOP_STATE == rinsebackState )
     {
-        if ( totalAdditionalRinsebackVolume_mL <  MAX_TOTAL_ADDITIONAL_RINSEBACK_VOLUME_ML )
-        {
-            result = TRUE;
-            additionalRinsebackRequested = TRUE;
-        }
-        else
-        {
-            *rejReason = REQUEST_REJECT_REASON_ADDL_RINSEBACK_MAX_VOLUME_REACHED;
-        }
+        additionalRinsebackRequested = TRUE;
     }
     else
     {