Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r5069769a675a529142dfd5f9fb2491380cec8b83 -r332b21aa10060e7cec0284b9851ff1d86813a2b4
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 5069769a675a529142dfd5f9fb2491380cec8b83)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 332b21aa10060e7cec0284b9851ff1d86813a2b4)
@@ -1459,19 +1459,18 @@
         {
             ISOLATED_UF_DATA_PAYLOAD_T data;
             U32 durationInMinutes = getIsolatedUFDurationMin();
-            U32 durationSec       = durationInMinutes * SEC_PER_MIN;
-            U32 elapsedSec        = getIsolatedUFSessionElapsedTimeSec();
-            F32 volumeGoalMl      = getIsolatedUFSetVolumeMl();
+            U32 durationSec = durationInMinutes * SEC_PER_MIN;
+            U32 elapsedSec = getIsolatedUFSessionElapsedTimeSec();
+            F32 volumeGoalMl = getIsolatedUFSetVolumeMl();
 
-            data.mDuration        = durationInMinutes;
-            data.mElapsedTime     = elapsedSec;
-            data.mRemainingTime   = ( durationSec > elapsedSec ) ? ( durationSec - elapsedSec ) : 0U;
-            data.mSetVolume       = volumeGoalMl;
-            data.mVolumeDelivered = getIsolatedUFVolumeDrawn() * (F32)ML_PER_LITER;
-            data.mRate            = getIsolatedUFRateMlMin();
+            data.mDuration = durationSec;
+            data.mElapsedTime = elapsedSec;
+            data.mRemainingTime = ( durationSec > elapsedSec ) ? ( durationSec - elapsedSec ) : 0U;
+            data.mSetVolume = volumeGoalMl / (F32)ML_PER_LITER;
+            data.mVolumeDelivered = getIsolatedUFVolumeDrawn();
+            data.mRate = ( getIsolatedUFRateMlMin() * (F32)MIN_PER_HOUR ) / (F32)ML_PER_LITER;
 
-            sendMessage( MSG_ID_TD_ISOLATED_UF_DATA, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08 *)(&data), sizeof( ISOLATED_UF_DATA_PAYLOAD_T ) );
-
+            sendMessage( MSG_ID_TD_ISOLATED_UF_DATA, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08 *)(&data),sizeof( ISOLATED_UF_DATA_PAYLOAD_T ) );
             isolatedUFBroadcastTimerCtr = 0;
         }
     }