Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r7959a737a00d914ccea0f2f3f3a6ddcbd82d6334 -r9be15d1bdc8753e159388edd75499f837c148da2
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 7959a737a00d914ccea0f2f3f3a6ddcbd82d6334)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 9be15d1bdc8753e159388edd75499f837c148da2)
@@ -912,7 +912,6 @@
         // Reset bolus data before we start
         bolusSalineVolumeDelivered_mL = 0.0;
         bolusSalineLastVolumeTimeStamp = getMSTimerCount();
-
         // Bypass dialyzer
         setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
         setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rc9b28951079eff02aa70fd931b926195376a4910 -r9be15d1bdc8753e159388edd75499f837c148da2
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision c9b28951079eff02aa70fd931b926195376a4910)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 9be15d1bdc8753e159388edd75499f837c148da2)
@@ -746,8 +746,9 @@
         {
             lastTreatmentTimeStamp = getMSTimerCount();
             // Kick dialysis sub-mode off
-            setDialysisParams( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ), getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ),
-                               presMaxUFVolumeML, presUFRate );
+            setDialysisBloodPumpFlowRate( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ) );
+            setDialysisDialInFlowAndUFRate( getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presMaxUFVolumeML, presUFRate );
+
             if ( presUFRate > 0.0 )
             {
                 sendTreatmentLogEventData( UF_START_RESUME_EVENT, 0.0, presUFRate );
@@ -1045,7 +1046,7 @@
             presTreatmentTimeSecs = treatmentTime * SEC_PER_MIN;
             setTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME, ( presMaxUFVolumeML / (F32)ML_PER_LITER ) );
             setTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION, ( presTreatmentTimeSecs / SEC_PER_MIN ) );
-            setDialysisParams( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ), getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presMaxUFVolumeML, presUFRate );
+            setDialysisDialInFlowAndUFRate( getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presMaxUFVolumeML, presUFRate );
             signalInitiatePressureStabilization( USE_NORMAL_STABILIZATION_PERIOD );
         }
         else
@@ -1229,8 +1230,7 @@
             presUFRate = pendingUFRateChange;
             signalInitiatePressureStabilization( USE_NORMAL_STABILIZATION_PERIOD );
         }
-        setDialysisParams( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ), getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ),
-                           presMaxUFVolumeML, presUFRate );
+        setDialysisDialInFlowAndUFRate( getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presMaxUFVolumeML, presUFRate );
 
         // If UF paused, resume with new settings
         if ( ( TREATMENT_DIALYSIS_STATE == currentTreatmentState ) &&
@@ -1289,18 +1289,25 @@
              ( dialVolume <= MAX_DIALYSATE_VOLUME_ML ) )
         {
             result = TRUE;
-            sendTreatmentLogEventData( BLOOD_FLOW_RATE_CHANGE_EVENT, getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ), bloodRate );
-            sendTreatmentLogEventData( DIALYSATE_FLOW_RATE_CHANGE_EVENT, getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), dialRate );
-            if ( ( bloodRate != (U32)getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ) ) ||
-                 ( dialRate != (U32)getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ) ) )
+            //  handle blood pump flow rate change
+            if ( bloodRate != (U32)getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ) )
             {
+                sendTreatmentLogEventData( BLOOD_FLOW_RATE_CHANGE_EVENT, getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ), bloodRate );
                 signalInitiatePressureStabilization( USE_NORMAL_STABILIZATION_PERIOD );
+                // Set to new rate
+                setTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW, bloodRate );
+                setDialysisBloodPumpFlowRate( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ) );
             }
-            // Set to new rates
-            setTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW, bloodRate );
-            setTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW, dialRate );
-            setDialysisParams( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ), getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ),
-                               presMaxUFVolumeML, presUFRate );
+
+            // Handle dialysate flow rate changes
+            if ( dialRate != (U32)getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ) )
+            {
+                sendTreatmentLogEventData( DIALYSATE_FLOW_RATE_CHANGE_EVENT, getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), dialRate );
+                signalInitiatePressureStabilization( USE_NORMAL_STABILIZATION_PERIOD );
+                // Set to new rate
+                setTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW, dialRate );
+                setDialysisDialInFlowAndUFRate( getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presMaxUFVolumeML, presUFRate );
+            }
         }
         else
         {