Index: sources/drydemo/StateController.cpp
===================================================================
diff -u -r9edc9ba3995ca25a29bb74eeeae71f7d72965284 -r4533fba9bf69d25de21536b849b5d9cb09d959ee
--- sources/drydemo/StateController.cpp	(.../StateController.cpp)	(revision 9edc9ba3995ca25a29bb74eeeae71f7d72965284)
+++ sources/drydemo/StateController.cpp	(.../StateController.cpp)	(revision 4533fba9bf69d25de21536b849b5d9cb09d959ee)
@@ -54,6 +54,7 @@
         case ID_UI_TREATMENT_SET_POINT_DIALYSATE_TEMP_CHANGE_RQST:
         case ID_UI_UF_PAUSE_RESUME_RQST:
         case ID_UI_TREATMENT_UF_VOLUME_VALIDATE_RQST:
+        case ID_UI_ULTRAFILTRATION_CHANGE_CONFIRM_RQST:
             _treatmentRcvdMessages[receivedMsgID] = msg[1];
             break;
 
@@ -64,16 +65,6 @@
             _treatmentRcvdMessages[receivedMsgID] = 0;
             break;
 
-        //case ID_UI_TX_END_RQST:
-        //case ID_UI_CONSUMABLES_INSTALL:
-        //case ID_UI_INTALLATION_CONFIRM:
-        //case ID_UI_PATIENT_CONNECTION_RQST:
-        //case ID_UI_PATIENT_CONNECTION_CONF_RQST:
-        //case ID_UI_START_TX_RQST:
-        //case ID_UI_SERVICE_MODE_RQST:
-        //    _hasUserConfirmedToProceed = true;
-        //    break;
-
         case ID_NONE:
         case ID_TD_OP_MODE_DATA:
         case ID_TD_TREATMENT_STATE_DATA:
@@ -103,6 +94,8 @@
         case ID_TD_TREATMENT_SET_POINT_DIALYSATE_TEMP_CHANGE_RESP:
         case ID_TD_UF_PAUSE_RESUME_RESP:
         case ID_TD_TREATMENT_UF_VOLUME_VALIDATE_RESP:
+        case ID_TD_TREATMENT_PARAM_RANGES_DATA:
+        case ID_TD_ULTRAFILTRATION_CHANGE_CONFIRM_RESP:
             // Do nothing
             break;
     }
@@ -374,6 +367,7 @@
         handleTreatmentTimeProcessAndBroadcastData(BC_IMMEDIATELY);
         handleDDGenDialysateModeBroadcastData(BC_IMMEDIATELY);
         initializeTreatmentTimeAndUltrafiltration();
+        handleTreatmentSettingBroadcastData(BC_IMMEDIATELY);
         status = STATE_ON_ACTION;
         qDebug() << "Tx on entry";
     };
@@ -399,6 +393,9 @@
         handleSetPointDialysateTemperatureChange();
         handleUltrafiltrationBroadcastData(BC_DELAYED);
         handleUltrafiltrationPauseResume();
+        handleUltrafiltrationVolumeChangeValidation();
+        handleTreatmentSettingBroadcastData(BC_DELAYED);
+        handleUltrafiltrationVolumeChangeConfirm();
         if ((_treatmentStatus.treatmentElapsedTimeMS / MILLISECONDS_PER_SECOND) >= (_treatmentParams.treatmentDurationMin * SECONDS_PER_MINUTE)) {
             _treatmentStatus.stateTransitionEvent = "T_Tx_2_TE";
             status                                = STATE_ON_EXIT;
@@ -617,7 +614,7 @@
     if (rejectReasons.isEmpty()) {
         // If the default reject reasons is empty, it means there were no reject reasons or extra payloads so assume none
         resp.append(static_cast<quint32>(REQUEST_REJECT_REASON_NONE));
-        qDebug() << "Empty" << rejectReasons;
+        qDebug() << "Empty";
     }
     else {
         for (auto item: rejectReasons) { resp.append(item); }