Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -rac6532c81f2a6d4ad1c67420c22d59f6aeeaae13 -r9798f57bc288270fe058fe098a76088cbb34d50c
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision ac6532c81f2a6d4ad1c67420c22d59f6aeeaae13)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 9798f57bc288270fe058fe098a76088cbb34d50c)
@@ -764,14 +764,15 @@
     // Update UF ref volume in UF running state only
     refUFVolume += ( ( (F32)msSinceLast / MS_PER_SECOND ) / SEC_PER_MIN ) * setUFRate;
 
-    // Calculate UF volumes and provide to dialysate outlet pump controller
-    updateUFVolumes();
-
     // If we have reached target UF volume, UF is complete - set UF rate to zero for remainder of treatment
     if ( refUFVolume >= maxUFVolumeML )
     {
         setUFRate = 0.0;
     }
+
+    // Calculate UF volumes and provide to dialysate outlet pump controller
+    updateUFVolumes();
+
     // Handle saline bolus start request from user
     if ( TRUE == salineBolusStartRequested )
     {
@@ -804,7 +805,7 @@
  *************************************************************************/
 static UF_STATE_T handleUFOffState( DIALYSIS_STATE_T *dialysisState )
 {
-    UF_STATE_T result = UF_RUNNING_STATE;
+    UF_STATE_T result = UF_RUNNING_STATE;  // TODO - remove this state and handler
 
     return result;
 }
@@ -820,26 +821,8 @@
  *************************************************************************/
 static UF_STATE_T handleUFCompletedState( DIALYSIS_STATE_T *dialysisState )
 {
-    UF_STATE_T result = UF_COMPLETED_STATE;
+    UF_STATE_T result = UF_RUNNING_STATE;  // TODO - remove this state and handler
 
-    // Calculate UF volumes and provide to dialysate outlet pump controller
-    updateUFVolumes();
-
-    // Handle saline bolus start request from user
-    if ( TRUE == salineBolusStartRequested )
-    {
-        salineBolusAutoResumeUF = FALSE;
-        // Go to saline bolus state
-        if ( SALINE_BOLUS_STATE_IDLE == currentSalineBolusState )
-        {
-            *dialysisState = DIALYSIS_SALINE_BOLUS_STATE;
-        }
-        else
-        {
-            salineBolusStartRequested = FALSE;
-        }
-    }
-
     return result;
 }