Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rc62b21415ad7b2a77be6d0b0adf06316d2ccb51b -r3227fa2625279833f22926c981309b7ae11bdfca
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision c62b21415ad7b2a77be6d0b0adf06316d2ccb51b)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 3227fa2625279833f22926c981309b7ae11bdfca)
@@ -80,9 +80,7 @@
 static BOOL rinsebackDone;                                      ///< Flag indicates whether a rinseback has been completed. Set FALSE at start of blood prime.  Set TRUE at init and end of rinseback.
 static BOOL treatmentCompleted;                                 ///< Flag indicates whether the treatment has completed.
 
-static U32 presTreatmentTimeSecs;                               ///< Prescribed treatment time (in minutes).
-static U32 presBloodFlowRate;                                   ///< Prescribed blood flow rate (in mL/min).
-static U32 presDialysateFlowRate;                               ///< Prescribed dialysate flow rate (in mL/min).
+static U32 presTreatmentTimeSecs;                               ///< Prescribed treatment time (in seconds).
 static F32 presMaxUFVolumeML;                                   ///< Prescribed ultrafiltration volume (in mL).
 static F32 presUFRate;                                          ///< Prescribed ultrafiltration rate (in mL/min).
 
@@ -166,8 +164,6 @@
     treatmentParamsRangesBroadcastTimerCtr = TREATMENT_SETTINGS_RANGES_PUB_INTERVAL;  // So we send ranges immediately when we begin treatment mode
 
     presTreatmentTimeSecs = 0;
-    presBloodFlowRate = 0;
-    presDialysateFlowRate = 0;
     presMaxUFVolumeML = 0.0;
     presUFRate = 0.0;
 
@@ -680,8 +676,6 @@
     lastTreatmentTimeStamp = getMSTimerCount();
 
     presTreatmentTimeSecs = SEC_PER_MIN * getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION );
-    presBloodFlowRate = getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW );
-    presDialysateFlowRate = getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW );
     presMaxUFVolumeML = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME ) * (F32)ML_PER_LITER;
     presUFRate = presMaxUFVolumeML / (F32)getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION );
 
@@ -719,7 +713,8 @@
         {
             lastTreatmentTimeStamp = getMSTimerCount();
             // Kick dialysis sub-mode off
-            setDialysisParams( presBloodFlowRate, presDialysateFlowRate, presMaxUFVolumeML, presUFRate );
+            setDialysisParams( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ), getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ),
+                               presMaxUFVolumeML, presUFRate );
             transitionToDialysis();
             result = TREATMENT_DIALYSIS_STATE;
         }
@@ -958,7 +953,7 @@
          ( CALC_ELAPSED_TREAT_TIME_IN_MIN() < treatmentTime ) && ( treatmentTime >= MIN_TREATMENT_TIME_MINUTES ) )
     {
         F32 uFVolume;
-        U32 dialVolume = presDialysateFlowRate * treatmentTime;   // In mL
+        U32 dialVolume = getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ) * treatmentTime;   // In mL
 
         // Always adjust UF volume to accommodate treatment time change (not UF rate)
         uFVolume = ( (F32)( treatmentTime - CALC_ELAPSED_TREAT_TIME_IN_MIN() ) * presUFRate ) + getUltrafiltrationReferenceVolume();
@@ -970,7 +965,7 @@
             sendTreatmentLogEventData( TREATMENT_DURATION_CHANGE_EVENT, ( presTreatmentTimeSecs / SEC_PER_MIN ), treatmentTime );
             presMaxUFVolumeML = uFVolume;
             presTreatmentTimeSecs = treatmentTime * SEC_PER_MIN;
-            setDialysisParams( presBloodFlowRate, presDialysateFlowRate, presMaxUFVolumeML, presUFRate );
+            setDialysisParams( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ), getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presMaxUFVolumeML, presUFRate );
         }
         else
         {
@@ -1048,9 +1043,9 @@
     {
         DIALYSIS_STATE_T currDialysisState = getDialysisState();
         UF_STATE_T currUFState = getUltrafiltrationState();
-        F32 uFRate = uFVolume / ((F32)presTreatmentTimeSecs / (F32)SEC_PER_MIN);  // What UF rate would be if user selected to adjust it
-        U32 trtTime = (S32)( uFVolume / presUFRate ) + 1;                         // What the treatment duration would be if user selected to adjust it
-        U32 dialVolume = presDialysateFlowRate * trtTime;                         // What dialysate volume would be if user selected to adjust time
+        F32 uFRate = uFVolume / ((F32)presTreatmentTimeSecs / (F32)SEC_PER_MIN);                // What UF rate would be if user selected to adjust it
+        U32 trtTime = (S32)( uFVolume / presUFRate ) + 1;                                       // What the treatment duration would be if user selected to adjust it
+        U32 dialVolume = getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ) * trtTime;  // What dialysate volume would be if user selected to adjust time
 
         // UF should already be paused but let's make sure.
         if ( ( TREATMENT_DIALYSIS_STATE == currentTreatmentState ) &&
@@ -1155,7 +1150,8 @@
         {
             presUFRate = pendingUFRateChange;
         }
-        setDialysisParams( presBloodFlowRate, presDialysateFlowRate, presMaxUFVolumeML, presUFRate );
+        setDialysisParams( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ), getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ),
+                           presMaxUFVolumeML, presUFRate );
 
         // If UF paused, resume with new settings
         if ( ( TREATMENT_DIALYSIS_STATE == currentTreatmentState ) &&
@@ -1213,12 +1209,13 @@
              ( dialVolume <= MAX_DIALYSATE_VOLUME_ML ) )
         {
             result = TRUE;
-            sendTreatmentLogEventData( BLOOD_FLOW_RATE_CHANGE_EVENT, presBloodFlowRate, bloodRate );
-            sendTreatmentLogEventData( DIALYSATE_FLOW_RATE_CHANGE_EVENT, presDialysateFlowRate, dialRate );
+            sendTreatmentLogEventData( BLOOD_FLOW_RATE_CHANGE_EVENT, getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ), bloodRate );
+            sendTreatmentLogEventData( DIALYSATE_FLOW_RATE_CHANGE_EVENT, getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), dialRate );
             // Set to new rates
-            presBloodFlowRate = bloodRate;
-            presDialysateFlowRate = dialRate;
-            setDialysisParams( presBloodFlowRate, presDialysateFlowRate, presMaxUFVolumeML, presUFRate );
+            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 );
         }
         else
         {
@@ -1240,7 +1237,8 @@
     {
         rejectReason = REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE;
     }
-    sendChangeBloodDialysateRateChangeResponse( result, (U32)rejectReason, presBloodFlowRate, presDialysateFlowRate );
+    sendChangeBloodDialysateRateChangeResponse( result, (U32)rejectReason, getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ),
+                                                getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ) );
     // Send new ranges for settings
     broadcastTreatmentSettingsRanges();
 
@@ -1427,7 +1425,7 @@
         // Compute maximum treatment duration (from both UF and dialysate volume perspectives)
         U32 maxTimeRem = ( MAX_UF_VOLUME_ML - (U32)getUltrafiltrationReferenceVolume() ) / ( presUFRate > 0.0 ? (U32)presUFRate : 1 );
         U32 maxTime1 = minTime + maxTimeRem;
-        U32 maxTime2 = MAX_DIALYSATE_VOLUME_ML / presDialysateFlowRate;
+        U32 maxTime2 = MAX_DIALYSATE_VOLUME_ML / getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW );
         U32 maxTime = MAX( maxTime1, maxTime2 );
         // Compute minimum UF volume
         F32 minUFVol = getUltrafiltrationReferenceVolume() + presUFRate;