Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r95d7d8e230da1c04c2fed2be5a43afd273d95846 -r944c891f790440233f0950e335f33f477a01fe02
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 95d7d8e230da1c04c2fed2be5a43afd273d95846)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 944c891f790440233f0950e335f33f477a01fe02)
@@ -738,8 +738,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 );
@@ -1037,7 +1038,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
@@ -1221,8 +1222,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 ) &&
@@ -1281,18 +1281,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
         {