Index: sources/view/hd/data/VHDTreatmentStatesData.h
===================================================================
diff -u -r2cee3c28bf7565eeb55dcb033961fe6962f11d16 -rbd01334f257c35b96b7b232beacbcd7fae60c852
--- sources/view/hd/data/VHDTreatmentStatesData.h	(.../VHDTreatmentStatesData.h)	(revision 2cee3c28bf7565eeb55dcb033961fe6962f11d16)
+++ sources/view/hd/data/VHDTreatmentStatesData.h	(.../VHDTreatmentStatesData.h)	(revision bd01334f257c35b96b7b232beacbcd7fae60c852)
@@ -77,8 +77,6 @@
     // coco end
     PROPERTY( bool   , ufPaused                 , false) ///< UF_PAUSED_STATE                           = 1  # Paused state of the ultrafiltration state machine
     PROPERTY( bool   , ufRunning                , false) ///< UF_RUNNING_STATE                          = 2  # Running state of the ultrafiltration state machine
-    PROPERTY( bool   , ufOff                    , true ) ///< UF_OFF_STATE                              = 3  # Completed/off state of the ultrafiltration state machine
-    PROPERTY( bool   , ufCompleted              , false) ///< UF_COMPLETED_STATE                        = 4  # Completed state of ultrafiltration state machine
 
     // ---- Saline Bolus states
     PROPERTY( bool   , sbIdle                   , true ) ///< SALINE_BOLUS_STATE_IDLE                   = 0  # No saline bolus delivery is in progress
@@ -88,11 +86,12 @@
 
     // ---- Heparin states
     PROPERTY( bool   , hpOff                    , true ) ///< HEPARIN_STATE_OFF                         = 0  # No heparin delivery is in progress
-    PROPERTY( bool   , hpPaused                 , false) ///< HEPARIN_STATE_PAUSED                      = 1  # Heparin delivery paused
-    PROPERTY( bool   , hpInitial_bolus          , false) ///< HEPARIN_STATE_INITIAL_BOLUS               = 2  # Initial heparin bolus delivery in progress
-    PROPERTY( bool   , hpDispensing             , false) ///< HEPARIN_STATE_DISPENSING                  = 3  # Gradual heparin dispensing in progress
-    PROPERTY( bool   , hpCompleted              , false) ///< HEPARIN_STATE_COMPLETED                   = 4  # Heparin delivery stopped due to the set stop time before treatment end
-    PROPERTY( bool   , hpEmpty                  , false) ///< HEPARIN_STATE_EMPTY                       = 5  # Heparin Syringe empty
+    PROPERTY( bool   , hpStopped                , false) ///< HEPARIN_STATE_STOPPED                     = 1  # Heparin delivery stopped by alarm or not yet started
+    PROPERTY( bool   , hpPaused                 , false) ///< HEPARIN_STATE_PAUSED                      = 2  # Heparin delivery paused
+    PROPERTY( bool   , hpInitial_bolus          , false) ///< HEPARIN_STATE_INITIAL_BOLUS               = 3  # Initial heparin bolus delivery in progress
+    PROPERTY( bool   , hpDispensing             , false) ///< HEPARIN_STATE_DISPENSING                  = 4  # Gradual heparin dispensing in progress
+    PROPERTY( bool   , hpCompleted              , false) ///< HEPARIN_STATE_COMPLETED                   = 5  # Heparin delivery stopped due to the set stop time before treatment end
+    PROPERTY( bool   , hpEmpty                  , false) ///< HEPARIN_STATE_EMPTY                       = 6  # Heparin Syringe empty
 
     // Rinseback States
     PROPERTY( bool   , rbInit                   , true ) ///< RINSEBACK_STOP_INIT_STATE                 = 0 # Start state (stopped) of the rinseback sub-mode state machine