Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rad1296a077cec6ed95674cc1267a750aaf8213c4 -r4205dc894c6df0d84072778fcd80dcaed93f75fa
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision ad1296a077cec6ed95674cc1267a750aaf8213c4)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 4205dc894c6df0d84072778fcd80dcaed93f75fa)
@@ -72,7 +72,7 @@
 static BOOL treatmentCompleted;                                 ///< Flag indicates whether the treatment has completed.
 
 static U32  presTreatmentTimeSecs;                              ///< Prescribed treatment time (in seconds).
-static F32  presUFVolumeMl;                                      ///< Prescribed ultrafiltration volume (in L).
+static F32  presUFVolumeMl;                                      ///< Prescribed ultrafiltration volume (in Ml).
 static F32  presUFRateMlMin;                                    ///< Prescribed ultrafiltration rate (in mL/Min).
 
 static U32  treatmentTimeMS;                                    ///< Elapsed treatment time (in ms).
@@ -929,13 +929,13 @@
  * @details \b Outputs: presTreatmentTimeSecs, presUFVolumeL, presUFRateLHr.
  * @return none
  *************************************************************************/
-void updateTreatmentBroadcastData( void )
+void updateTreatmentBroadcastData( F32 ufRateLhr )
 {
     presTreatmentTimeSecs = getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION ) * SEC_PER_MIN;
 
-    presUFVolumeL = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME );
+    presUFVolumeMl = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME );
 
-    presUFRateLHr = presUFVolumeL / ( (F32)getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION ) / (F32)MIN_PER_HOUR );
+    presUFRateMlMin  = ( ufRateLhr * (F32)ML_PER_LITER ) / (F32)MIN_PER_HOUR;
 }
 
 /*********************************************************************//**
@@ -1159,7 +1159,7 @@
 
         presUFRateLHr           = presUFVolumeL / ( (F32)getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION ) / (F32)MIN_PER_HOUR );
         data.setUFVolumeL       = presUFVolumeL;
-        data.tgtUFRateLHr       = presUFRateLHr;
+        data.tgtUFRateLHr       =  ( presUFRateMlMin * (F32)MIN_PER_HOUR ) / (F32)ML_PER_LITER;
         data.ufVolumeDeliveredL = getUltrafiltrationVolumeDrawn();
         data.ufState            = (U32)getDialysisState();