Index: DDDefs.h
===================================================================
diff -u -rada74713e29bcb1fc906b5ffef3f82a4af225670 -r4fe94831a7e8e6ad6d7bfbd56671fc43c375c611
--- DDDefs.h	(.../DDDefs.h)	(revision ada74713e29bcb1fc906b5ffef3f82a4af225670)
+++ DDDefs.h	(.../DDDefs.h)	(revision 4fe94831a7e8e6ad6d7bfbd56671fc43c375c611)
@@ -520,10 +520,11 @@
 enum Bicarb_Chamber_F_Fill_Exec_States
 {
     BICARB_CHAMBER_START_STATE = 0,                                  ///< Initial state of Chamber F fill
-    BICARB_CARTRIDGE_FILL_WATER_START_STATE,                         ///< Dry bicart fill water start state while dialysate delivery
-    BICARB_CARTRIDGE_FILL_WATER_END_STATE,                           ///< Dry bicart fill water end state while dialysate delivery
     BICARB_CHAMBER_SUPPLY_STATE,                                     ///< Bicarb Chamber fill start state
     BICARB_CHAMBER_PRESSURE_CHECK_STATE,                             ///< Bicarb Chamber pressure check start state
+    BICARB_CARTRIDGE_FILL_WATER_START_STATE,                         ///< Dry bicart fill water start state while dialysate delivery
+    BICARB_CARTRIDGE_FILL_WATER_END_STATE,                           ///< Dry bicart fill water end state while dialysate delivery
+    //TODO: remove the below state later if testing goes well.
     BICARB_SUPPLY_VENT_START_STATE,                                  ///< Bicarb Chamber supply vent cartridge and Chamber F start state
     BICARB_SUPPLY_VENT_END_STATE,                                    ///< Bicarb Chamber supply vent cartridge and Chamber F end state
     NUM_OF_BICARB_CHAMBER_FILL_EXEC_STATES                           ///< Number of Bicarb chamber fill state