Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r108abddcbf729f7435073116191cd3903261df8f -r04334ed8d1e927939718b1d62fb01afef0a2b9a9
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 108abddcbf729f7435073116191cd3903261df8f)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 04334ed8d1e927939718b1d62fb01afef0a2b9a9)
@@ -203,10 +203,16 @@
         elapsedTreatmentTimeInSecs = presTreatmentTimeSecs;
         currentTreatmentState = TREATMENT_END_STATE;
     }
-    // broadcast treatment time at interval
+    // broadcast treatment time and state data at interval
     if ( ++treatmentTimeBroadcastTimerCtr >= TREATMENT_TIME_DATA_PUB_INTERVAL )
     {
-        broadcastTreatmentTime( presTreatmentTimeSecs, elapsedTreatmentTimeInSecs, presTreatmentTimeSecs - elapsedTreatmentTimeInSecs );
+        U32 timeRemaining = presTreatmentTimeSecs - elapsedTreatmentTimeInSecs;
+        DIALYSIS_STATE_T dialysisState = getDialysisState();
+        UF_STATE_T uFState = getUltrafiltrationState();
+        BOOL salineBolusInProgress = ( dialysisState == DIALYSIS_SOLUTION_INFUSION_STATE ? TRUE : FALSE );
+
+        broadcastTreatmentTime( presTreatmentTimeSecs, elapsedTreatmentTimeInSecs, timeRemaining );
+        broadcastTreatmentState( currentTreatmentState, uFState, salineBolusInProgress );
         treatmentTimeBroadcastTimerCtr = 0;
     }
 #endif
@@ -328,3 +334,48 @@
     return result;
 }
 
+/*************************************************************************
+ * @brief
+ * The verifyUFSettingsChange function verifies new ultrafiltration settings \n
+ * from the user.
+ * @details
+ * Inputs : none
+ * Outputs : none
+ * @param uFVolume : .
+ * @param adjustment : .
+ * @return TRUE if new UF settings valid, FALSE if not.
+ *************************************************************************/
+BOOL verifyUFSettingsChange( F32 uFVolume, UF_ADJ_T adjustment )
+{
+    BOOL result = FALSE;
+    OP_MODE currMode = getCurrentOperationMode();
+
+    // check if we are in treatment mode
+    if ( MODE_TREA == currMode )
+    {
+        // check
+    }
+    //sendChangeUFSettingsResponse( BOOL accepted, U32 volume_mL, U32 time_min, F32 ufRate_mL_min, U32 timeDiff, F32 rateDiff );
+
+    return result;
+}
+
+/*************************************************************************
+ * @brief
+ * The verifyUFSettingsConfirmation function verifies the user confirmed \n
+ * ultrafiltration settings change(s) and, if valid, implements the new settings.
+ * @details
+ * Inputs : none
+ * Outputs : none
+ * @param confirmed : .
+ * @param uFVolume : .
+ * @param treatmentTime : .
+ * @param uFRate : .
+ * @return next treatment mode state
+ *************************************************************************/
+BOOL verifyUFSettingsConfirmation( BOOL confirmed, F32 uFVolume, U32 treatmentTime, F32 uFRate )
+{
+    BOOL result = FALSE;
+
+    return result;
+}