Index: sources/drydemo/StateController.cpp
===================================================================
diff -u -r4d0fc455e6307639e72db490721c7768a487c014 -r6c0428ed8c6430924d54d5a42c45c8ec0c16c7c2
--- sources/drydemo/StateController.cpp	(.../StateController.cpp)	(revision 4d0fc455e6307639e72db490721c7768a487c014)
+++ sources/drydemo/StateController.cpp	(.../StateController.cpp)	(revision 6c0428ed8c6430924d54d5a42c45c8ec0c16c7c2)
@@ -87,6 +87,8 @@
         case ID_UI_PRESSURE_LIMITS_CHANGE_RQST:
         case ID_UI_DRY_BICART_DISCONNECT_RQST:
         case ID_UI_HDF_ADJUSTMENT_RQST:
+        case ID_UI_WATER_SAMPLE_RESULT_RQST:
+        case ID_UI_PAUSE_SUB_FLOW_RQST:
             if (msg.length() < RCVD_MSG_PAYLOAD_MIN_LEN) { qDebug() << "Msg with incomplete payload" << msg; return; }
             _treatmentRcvdMessages[receivedMsgID] = msg[RCVD_MSG_PAYLOAD_INDEX];
             break;
@@ -153,6 +155,8 @@
         case ID_TD_DRY_BICART_DISCONNECT_DATA:
         case ID_TD_DRY_BICART_DISCONNECT_RESP:
         case ID_TD_HDF_ADJUSTMENT_RESP:
+        case ID_TD_WATER_SAMPLE_RESULT_RESP:
+        case ID_TD_PAUSE_SUB_FLOW_RESP:
             // Do nothing
             break;
     }
@@ -258,6 +262,7 @@
 
         handleSetupTubingSetConnectionsRequestMessage();
         handleVitalsDataRquest();
+        handleTDWaterSampleResultRequest();
 
         if (! _treatmentRcvdMessages[ID_UI_ADJUST_DISPOSABLES_CONFIRM_RQST].isNull()){
             _treatmentRcvdMessages[ID_UI_ADJUST_DISPOSABLES_CONFIRM_RQST].clear();
@@ -330,7 +335,9 @@
         // Pressure methods
         handleFluidBolusRequestMessage();
         // Vitals method
-         handleVitalsDataRquest();
+        handleVitalsDataRquest();
+        // Water Sample
+        handleTDWaterSampleResultRequest();
         if (_treatmentSubStates.fluidBolusState == FLUID_BOLUS_SALINE_IN_PROGRESS_STATE){
             handleFluidBolusFluidDelivery(currBloodFlowMLPM);
             handleFluidBolusBroadcastData(BC_DELAYED);
@@ -434,9 +441,12 @@
         handleVitalsAdjustmentMessage();
         handleVitalsDataRquest();
         // HDF methods
-        handleTreatmentHDF();
-        handleHemodialfiltrationBroadcastData(BC_DELAYED);
+        handleHDFTreatment();
+        handleHDFBroadcastData(BC_DELAYED);
         handleHDFAdjustmentRequestMessage();
+        hadnleHDFPauseResumeRequestMessage();
+        // Water sample methods
+        handleTDWaterSampleResultRequest();
         // Treatment complete condition
         if ((_treatmentStatus.treatmentElapsedTimeMS / MILLISECONDS_PER_SECOND) >
             (_treatmentParams.treatmentDurationMin * SECONDS_PER_MINUTE)) {
@@ -500,6 +510,8 @@
         handleUltrafiltrationBroadcastData(BC_DELAYED);
         // Vitals methods
         handleVitalsDataRquest();
+        // Water sample methods
+        handleTDWaterSampleResultRequest();
     };
 
     auto onExit = [=](){
@@ -549,6 +561,8 @@
         handleWidenPressureLimitsMessage();
         // Vitals
         handleVitalsDataRquest();
+        // Water sample methods
+        handleTDWaterSampleResultRequest();
         handleUIConfirmMessage(GENERIC_CONFIRM_ID_TREATMENT_END, status);
         if (_treatmentStatus.hasRecircBeenRequested) {
             _treatmentStatus.stateTransitionEvent = "T_RB_2_RC";
@@ -601,6 +615,8 @@
         handleAlarmUserAction(status);
         // Vitals
         handleVitalsDataRquest();
+        // Water sample methods
+        handleTDWaterSampleResultRequest();
         if (_treatmentStatus.hasResumeTxBeenRequested) {
             _treatmentStatus.stateTransitionEvent = "T_RC_2_BP";
             status                                = STATE_ON_EXIT;
@@ -641,6 +657,8 @@
         handleTreatmentStatesBroadcastData(BC_DELAYED);
         // Vitals
         handleVitalsDataRquest();
+        // Water sample methods
+        handleTDWaterSampleResultRequest();
     };
 
     auto onExit = [=](){