Index: sources/view/hd/data/VHDTreatmentStatesData.h
===================================================================
diff -u -r3345651cca9723989785801ee25001dc3e4f28a1 -r58014dae52ee6357e88b9b03bcad457ddcb432e8
--- sources/view/hd/data/VHDTreatmentStatesData.h	(.../VHDTreatmentStatesData.h)	(revision 3345651cca9723989785801ee25001dc3e4f28a1)
+++ sources/view/hd/data/VHDTreatmentStatesData.h	(.../VHDTreatmentStatesData.h)	(revision 58014dae52ee6357e88b9b03bcad457ddcb432e8)
@@ -5,11 +5,11 @@
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
- * \file VHDTreatmentStatesData.h
- * \author (last) Behrouz NematiPour
- * \date (last) 08-Sep-2020
- * \author (original) Behrouz NematiPour
- * \date (original) 13-Aug-2020
+ * \file    VHDTreatmentStatesData.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      07-Feb-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  13-Aug-2020
  *
  */
 #pragma once
@@ -84,8 +84,8 @@
     // ---- Treatment states - Basics
     // coco begin validated: Manually tested
     // not used yet since the Treatment Start/stop/end has not been implemented yet.
-    PROPERTY( bool   , txStart                  , false) ///< TREATMENT_START_STATE                     Start treatment, prime blood side with gradual ramp for 1 min. while dialyzer is bypassed.  No dialysis or UF taking place
-    PROPERTY( bool   , txStop                   , false) ///< TREATMENT_STOP_STATE                      Treatment stopped.  All pumps off.  Dializer bypassed
+    PROPERTY( bool   , txStart                  , false) ///< TREATMENT_START_STATE                     Start treatment, prime blood side with gradual ramp for 1 min. while Dialyzer is bypassed.  No dialysis or UF taking place
+    PROPERTY( bool   , txStop                   , false) ///< TREATMENT_STOP_STATE                      Treatment stopped.  All pumps off.  Dialyzer bypassed
     PROPERTY( bool   , txEnd                    , false) ///< TREATMENT_END_STATE                       Treatment has ended.  All pumps off.  Dialyzer is bypassed.  Blood lines are closed.  User to disconnect
     // coco end
 
@@ -97,9 +97,22 @@
     // coco end
     // ---- Treatment states - Rinse back
     PROPERTY( bool   , txRinseback              , false) ///< TREATMENT_RINSEBACK_STATE                 Perform rinseback with saline.  Dialyzer bypassed. Dialysate recirculating
+
+    // Rinseback States
+    PROPERTY( bool   , rbSInit                  , false) ///< Start state (stopped) of the rinseback sub-mode state machine
+    PROPERTY( bool   , rbRun                    , false) ///< Rinseback running state of the rinseback sub-mode state machine
+    PROPERTY( bool   , rbPaused                 , false) ///< Rinseback paused state of the rinseback sub-mode state machine
+    PROPERTY( bool   , rbStop                   , false) ///< Rinseback stopped (done) state of the rinseback sub-mode state machine
+    PROPERTY( bool   , rbRun_Additional         , false) ///< Additional rinseback volume (10 mL) state of the rinseback sub-mode state machine
+
     // ---- Treatment states - Recirculate
     PROPERTY( bool   , txRecirculate            , false) ///< TREATMENT_RECIRC_STATE                    Recirculate saline and dialysate while patient disconnected.  Blood lines open and shunted.  Dialyzer is bypassed
 
+    // Recirculate states
+    PROPERTY( bool   , rcStarted                , false) ///< Re-circulate state of the treatment re-circulate sub-mode state machine
+    PROPERTY( bool   , rcStopped                , false) ///< Stopped state of the treatment re-circulate sub-mode state machine
+
+
     // class definition
     VIEW_DEC_CLASS(VHDTreatmentStates)