Index: sources/view/td/data/treatment/VTDTreatmentStatesData.h
===================================================================
diff -u -r726dc38cf98a8f0a827b2efeecfd32996d0eee90 -r5a2f0e2068f2998a9bf7377d39f2eecb0d4ad15a
--- sources/view/td/data/treatment/VTDTreatmentStatesData.h	(.../VTDTreatmentStatesData.h)	(revision 726dc38cf98a8f0a827b2efeecfd32996d0eee90)
+++ sources/view/td/data/treatment/VTDTreatmentStatesData.h	(.../VTDTreatmentStatesData.h)	(revision 5a2f0e2068f2998a9bf7377d39f2eecb0d4ad15a)
@@ -75,6 +75,7 @@
     PROPERTY( bool   , sbIdle                   , true ) ///< SALINE_BOLUS_STATE_IDLE                   = 0  # No saline bolus delivery is in progress
     PROPERTY( bool   , sbWaitPump               , false) ///< SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP    = 1  # Wait for pumps to stop before starting bolus
     PROPERTY( bool   , sbRunning                , false) ///< SALINE_BOLUS_STATE_IN_PROGRESS            = 2  # A saline bolus delivery is in progress
+    PROPERTY( bool   , sbSubstitutionRunning    , false) ///< FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE   = 3  # A substitution delivery is in progress
 
     // ---- Heparin states
     PROPERTY( bool   , hpOff                    , true ) ///< HEPARIN_STATE_OFF                         = 0  # No heparin delivery is in progress
@@ -89,7 +90,8 @@
     // Dialysis States
     PROPERTY( bool   , dyStart                  , true ) ///< Start state of the dialysis sub-mode state machine
     PROPERTY( bool   , dyUltrafiltration        , false) ///< Ultrafiltration state of the dialysis sub-mode state machine
-    PROPERTY( bool   , dySalineBolus            , false) ///< Saline bolus state of the dialysis sub-mode state machine
+    PROPERTY( bool   , dyUltrafiltrationPaused  , false) ///< Ultrafiltration Paused state of the dialysis sub-mode state machine
+    PROPERTY( bool   , dyFluidBolus             , false) ///< Fluid Bolus state of the dialysis sub-mode state machine
 
     // Rinseback States
     PROPERTY( bool   , rbInit                   , true ) ///< RINSEBACK_STOP_INIT_STATE                 = 0 # Start state (stopped) of the rinseback sub-mode state machine
@@ -109,17 +111,20 @@
     PROPERTY( bool   , bpRamp                   , true ) ///< BLOOD_PRIME_RAMP_STATE                    = 0 # Ramp state of the blood prime sub-mode state machine
     PROPERTY( bool   , bpRun                    , true ) ///< BLOOD_PRIME_RUN_STATE                     = 1 # Run state of the blood prime sub-mode state machine
     PROPERTY( bool   , bpPaused                 , true ) ///< BLOOD_PRIME_PAUSED_STATE                  = 2 # Paused state of the blood prime sub-mode state machine
+    PROPERTY( bool   , bpFluidBolus             , true ) ///< BLOOD_PRIME_FLUID_BOLUS_STATE             = 3 # Fluid bolus is running during blood prime
 
     // Treatment End
     PROPERTY( bool   , teWaitRinseback          , true ) ///< TREATMENT_END_WAIT_FOR_RINSEBACK_STATE    = 0 # Wait for rinseback state of the treatment end sub-mode state machine
     PROPERTY( bool   , tePaused                 , false) ///< TREATMENT_END_PAUSED_STATE                = 1 # Paused state of the treatment end sub-mode state machine
+    PROPERTY( bool   , teFluidBolus             , false) ///< TREATMENT_END_FLUID_BOLUS_STATE           = 2 # Fluid Bolus state of the treatment end sub-mode state machine
 
     // Treatment Stop
-    PROPERTY( bool   , tsRecirculate            , true ) ///< TREATMENT_STOP_RECIRC_STATE               = 0, Dialysate and Blood re-circulation state of the treatment stop sub-mode state machine
-    PROPERTY( bool   , tsRecirculateDialysate   , false) ///< TREATMENT_STOP_RECIRC_DIALYSATE_ONLY_STATE= 1, Re-circulate Dialysate only state of the treatment re-circulate sub-mode state machine
-    PROPERTY( bool   , tsRecirculateBlood       , false) ///< TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE    = 2, Re-circulate Blood only state of the treatment re-circulate sub-mode state machine
-    PROPERTY( bool   , tsRecirculateNo          , false) ///< TREATMENT_STOP_NO_RECIRC_STATE            = 3, No re-circulation state of the treatment stop sub-mode state machine
-    PROPERTY( bool   , tsRecoverBloodDetect     , false) ///< TREATMENT_STOP_RECOVER_BLOOD_DETECT_STATE = 4, Treatment stop recover blood detect state
+    PROPERTY( bool   , tsRecirculate            , true ) ///< TREATMENT_PAUSED_RECIRC_STATE               = 0, Dialysate and Blood re-circulation state of the treatment stop sub-mode state machine
+    PROPERTY( bool   , tsRecirculateDialysate   , false) ///< TREATMENT_PAUSED_RECIRC_DIALYSATE_ONLY_STATE= 1, Re-circulate Dialysate only state of the treatment re-circulate sub-mode state machine
+    PROPERTY( bool   , tsRecirculateBlood       , false) ///< TREATMENT_PAUSED_RECIRC_BLOOD_ONLY_STATE    = 2, Re-circulate Blood only state of the treatment re-circulate sub-mode state machine
+    PROPERTY( bool   , tsRecirculateNo          , false) ///< TREATMENT_PAUSED_NO_RECIRC_STATE            = 3, No re-circulation state of the treatment stop sub-mode state machine
+    PROPERTY( bool   , tsRecoverBloodDetect     , false) ///< TREATMENT_PAUSED_RECOVER_BLOOD_DETECT_STATE = 4, Treatment stop recover blood detect state
+    PROPERTY( bool   , tsFluidBolus             , false) ///< TREATMENT_PAUSED_FLUID_BOLUS_STATE = 5, Fluid Bolus state of the treatment paused sub-mode state machine
 
     // class definition
     VIEW_DEC_CLASS(VTDTreatmentStates)