Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rcbb126cfd3a02c08436a66ffecb2bdf926263705 -re4cc37257141c5227186ac6d8ca3d6c87d009042
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision cbb126cfd3a02c08436a66ffecb2bdf926263705)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision e4cc37257141c5227186ac6d8ca3d6c87d009042)
@@ -1374,16 +1374,15 @@
     // Broadcast treatment time data at interval
     if ( ++treatmentTimeBroadcastTimerCtr >= getU32OverrideValue( &treatmentTimePublishInterval ) )
     {
+        TREATMENT_TIME_DATA_T data = { 0, 0, 0 };
+
         if ( isTreatmentCompleted() != TRUE )
         {
-            U32 timeRemaining = presTreatmentTimeSecs - elapsedTreatmentTimeInSecs;
-
-            broadcastTreatmentTime( presTreatmentTimeSecs, elapsedTreatmentTimeInSecs, timeRemaining );
+            data.treatmentTimePrescribedinSec = presTreatmentTimeSecs;
+            data.treatmentTimeElapsedinSec = elapsedTreatmentTimeInSecs;
+            data.treatmentTimeRemaininginSec = presTreatmentTimeSecs - elapsedTreatmentTimeInSecs;
         }
-        else // If treatment is completed, send zeroes to UI
-        {
-            broadcastTreatmentTime( 0, 0, 0 );
-        }
+        broadcastData( MSG_ID_TREATMENT_TIME, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( TREATMENT_TIME_DATA_T ) );
         treatmentTimeBroadcastTimerCtr = 0;
     }
     // Broadcast treatment state data at interval
@@ -1402,7 +1401,7 @@
         payload.heparinState = getHeparinState();
         payload.dialysisState = getDialysisState();
 
-        broadcastTreatmentState( payload );
+        broadcastData( MSG_ID_TREATMENT_STATE, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&payload, sizeof( TREATMENT_STATE_DATA_T ) );
         treatmentStateBroadcastTimerCtr = 0;
     }
 }