Index: sources/drydemo/StateController.h
===================================================================
diff -u -r4533fba9bf69d25de21536b849b5d9cb09d959ee -r8aa65ae1bbef5f6121783026efeeb99114c14414
--- sources/drydemo/StateController.h	(.../StateController.h)	(revision 4533fba9bf69d25de21536b849b5d9cb09d959ee)
+++ sources/drydemo/StateController.h	(.../StateController.h)	(revision 8aa65ae1bbef5f6121783026efeeb99114c14414)
@@ -34,20 +34,25 @@
     struct Treatment_Status_Vars {
         bool    hasTxParamsBeenInitialized;
         quint32 treatmentElapsedTimeMS;
-        quint32 remainingTreatmentTimeS; // TODO remove
-        quint32 prescribedTreatmentTimeS; // TODO remove
         User_Command_ID userCmd;
         QString stateTransitionEvent;
         float accumFluidBolusDeliveredML;
         float totalFluidBolusDeliveredML;
         Fluid_Bolus_States fluidBolusState;
         Treatment_States txState;
         Dialysis_States dialysisSubState;
+        // UF variables
         float presUFRateMLPM;
         float ufVolDeliveredL;
         bool validateUFVolReceived;
         float validateUFVolGoalL;
         float validateUFRateLHR;
+        // Tx dur variables
+        bool validateTxDurReceived;
+        quint32 validateTxDurMin;
+        quint32 validateHepDurMin;
+        // Alarm variabls
+        bool isAnAlarmActive;
     };
 
     struct Treatment_Params {
@@ -140,6 +145,8 @@
     void handleUltrafiltrationVolumeChangeValidation();
     void handleTreatmentSettingBroadcastData(const Broadcast_Type BCType);
     void handleUltrafiltrationVolumeChangeConfirm();
+    void handleTreatmentTimeChangeValidation();
+    void handleTreatmentTimeChangeConfirm();
 
     // Treatment end methods