Index: TDDefs.h
===================================================================
diff -u -r9c6f9c0dc74d57ab0350ee19974e72de930876e9 -r84d7a7d65610fd1f187dd472d5758d66c5359d4b
--- TDDefs.h	(.../TDDefs.h)	(revision 9c6f9c0dc74d57ab0350ee19974e72de930876e9)
+++ TDDefs.h	(.../TDDefs.h)	(revision 84d7a7d65610fd1f187dd472d5758d66c5359d4b)
@@ -137,14 +137,12 @@
 /// Enumeration of pre-treatment mode states (sub-mode).
 enum TD_Pre_Treatment_Mode_States
 {
-    TD_PRE_TREATMENT_WATER_SAMPLE_STATE = 0,                                ///< Water sample state
-    TD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE,                            ///< Consumable self-tests state
-    TD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE,                               ///< No cartridge self-tests state
-    TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE,                              ///< Tube set install state
+    TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE = 0,                          ///< Tube set install state
     TD_PRE_TREATMENT_SELF_TEST_DRY_STATE,                                   ///< Self-tests when the cartridge is dry state
     TD_PRE_TREATMENT_PRIME_STATE,                                           ///< Prime blood and dialysate circuits and run wet self-tests state
     TD_PRE_TREATMENT_RECIRCULATE_STATE,                                     ///< Re-circulate blood and dialysate circuits state
     TD_PRE_TREATMENT_CONFIRM_RX_STATE,                                      ///< User reviews and confirms prescription ( Confirm Rx )
+    TD_PRE_TREATMENT_HEPARIN_SETUP_STATE,                                   ///< Heparin setup state
     TD_PRE_TREATMENT_PATIENT_CONNECTION_STATE,                              ///< Patient connection state
     NUM_OF_TD_PRE_TREATMENT_STATES                                          ///< Number of pre-treatment mode states
 };