Index: dialin/common/dg_defs.py
===================================================================
diff -u -rc179a1b072005028cb495911f463b2bfcd9aa1d2 -ra95fe2ff6a5462887410c5f1ffa99c7cf75e0411
--- dialin/common/dg_defs.py	(.../dg_defs.py)	(revision c179a1b072005028cb495911f463b2bfcd9aa1d2)
+++ dialin/common/dg_defs.py	(.../dg_defs.py)	(revision a95fe2ff6a5462887410c5f1ffa99c7cf75e0411)
@@ -209,12 +209,14 @@
     DG_CHEM_DISINFECT_STATE_PRIME_DISINFECTANT = 5
     DG_CHEM_DISINFECT_STATE_DISINFECTANT_FLUSH = 6
     DG_CHEM_DISINFECT_STATE_FILL_WITH_DISINFECTANT = 7
-    DG_CHEM_DISINFECT_STATE_R2_DISINFECTANT_FILL_R1_DRAIN = 8
-    DG_CHEM_DISINFECT_STATE_R1_DISINFECTANT_FILL_R2_DRAIN = 9
-    DG_CHEM_DISINFECT_STATE_CANCEL_BASIC_PATH = 10
-    DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH = 11
-    DG_CHEM_DISINFECT_STATE_COMPLETE = 12
-    NUM_OF_DG_CHEM_DISINFECT_STATES = 13
+    DG_CHEM_DISINFECT_STATE_DISINFECT_R1_TO_R2 = 8
+    DG_CHEM_DISINFECT_STATE_PARTIAL_DRAIN_R1_FILL_R2_TO_R1 = 9
+    DG_CHEM_DISINFECT_STATE_DISINFECT_R2_TO_R1 = 10
+    DG_CHEM_DISINFECT_STATE_PARTIAL_DRAIN_R2_FILL_R1_TO_R2 = 11
+    DG_CHEM_DISINFECT_STATE_CANCEL_BASIC_PATH = 12
+    DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH = 13
+    DG_CHEM_DISINFECT_STATE_COMPLETE = 14
+    NUM_OF_DG_CHEM_DISINFECT_STATES = 15
 
 @unique
 class DGChemDisinfectFlushStates(DialinEnum):
Index: dialin/dg/chemical_disinfect_flush.py
===================================================================
diff -u -rc179a1b072005028cb495911f463b2bfcd9aa1d2 -ra95fe2ff6a5462887410c5f1ffa99c7cf75e0411
--- dialin/dg/chemical_disinfect_flush.py	(.../chemical_disinfect_flush.py)	(revision c179a1b072005028cb495911f463b2bfcd9aa1d2)
+++ dialin/dg/chemical_disinfect_flush.py	(.../chemical_disinfect_flush.py)	(revision a95fe2ff6a5462887410c5f1ffa99c7cf75e0411)
@@ -37,7 +37,10 @@
         self.flush_state = DGChemDisinfectFlushStates.DG_CHEM_DISINFECT_FLUSH_STATE_START.value
         self.overall_elapsed_time = 0
         self.state_elapsed_time = 0
-        self.flush_drain_line_volume_l = 0.0
+        self.r1 = 0.0
+        self.r2 = 0.0
+        self.target_rinse_count = 0
+        self.rinse_count = 0
         self.flush_UI_state = DGChemDisinfectFlushUIStates.CHEM_DISINFECT_FLUSH_UI_STATE_NOT_RUNNING.value
 
         if self.can_interface is not None:
@@ -57,8 +60,9 @@
         self.overall_elapsed_time = 0
         self.state_elapsed_time = 0
 
-    @publish(["flush_state", "overall_elapsed_time", "state_elapsed_time", "flush_drain_line_volume_l",
-              "flush_UI_state"])
+    @publish(["flush_state", "overall_elapsed_time", "state_elapsed_time", "r1", "r2", "target_rinse_count",
+              "rinse_count", "flush_UI_state"])
+
     def _handler_chem_disinfect_flush_sync(self, message: dict) -> None:
         """
         Handles published flush message
@@ -72,14 +76,27 @@
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
         state_elapsed_time = struct.unpack('<I', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
-        drain_line_volume = struct.unpack('<f', bytearray(
+        cancellation_mode = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-        flush_ui_state = struct.unpack('<I', bytearray(
+        r1 = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
+        r2 = struct.unpack('f', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
+        target_rinse_count = struct.unpack('<I', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0]
+        rinse_count = struct.unpack('<I', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0]
+        ui = struct.unpack('i', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]
+        flush_ui_state = struct.unpack('<I', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0]
 
         self.flush_state = state
         self.overall_elapsed_time = int(elapsed_time / 1000)
         self.state_elapsed_time = int(state_elapsed_time / 1000)
-        self.flush_drain_line_volume_l = drain_line_volume
+        self.r1 = r1
+        self.r2 = r2
+        self.target_rinse_count = target_rinse_count
+        self.rinse_count = rinse_count
         self.flush_UI_state = flush_ui_state
 
Index: tests/dg_tests.py
===================================================================
diff -u -rc179a1b072005028cb495911f463b2bfcd9aa1d2 -ra95fe2ff6a5462887410c5f1ffa99c7cf75e0411
--- tests/dg_tests.py	(.../dg_tests.py)	(revision c179a1b072005028cb495911f463b2bfcd9aa1d2)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision a95fe2ff6a5462887410c5f1ffa99c7cf75e0411)
@@ -69,9 +69,13 @@
     return info
 
 def get_chemical_disinfect_flush_mode_info():
-    info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Drain_vol, {:5.3f}, Top_alarm, {}, '
-            .format(DGChemDisinfectFlushStates(dg.chemical_disinfect_flush.flush_state).name, dg.chemical_disinfect_flush.overall_elapsed_time, dg.chemical_disinfect_flush.state_elapsed_time,
-                    dg.chemical_disinfect_flush.flush_drain_line_volume_l, hd.alarms.alarm_top))
+    info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, r1, {:5.1f}, r2, {:5.1f}, '
+             'Target_rinse_count, {}, Rinse_count, {}, Top_alarm, {}, UI_state, {},'
+            .format(DGChemDisinfectFlushStates(dg.chemical_disinfect_flush.flush_state).name,
+                    dg.chemical_disinfect_flush.overall_elapsed_time, dg.chemical_disinfect_flush.state_elapsed_time,
+                    dg.chemical_disinfect_flush.r1, dg.chemical_disinfect_flush.r2,
+                    dg.chemical_disinfect_flush.target_rinse_count, dg.chemical_disinfect_flush.rinse_count,
+                    hd.alarms.alarm_top, dg.chemical_disinfect_flush.flush_UI_state))
     return info
 
 def get_heat_disinfect_mode_info():
@@ -81,7 +85,7 @@
                     dg.heat_disinfect.overall_elapsed_time, dg.heat_disinfect.state_elapsed_time,
                     dg.heat_disinfect.heat_disinfect_count_down_time, dg.heat_disinfect.r1_level,
                     dg.heat_disinfect.r2_level, hd.alarms.alarm_top,
-                    DGHeatDisinfectUIStates(dg.chemical_disinfect.chemical_disinfect_ui_state).name))
+                    DGHeatDisinfectUIStates(dg.heat_disinfect.heat_disinfect_ui_state).name))
     return info
 
 
@@ -608,8 +612,6 @@
             # If the mode came back to standby or standby solo
             if dg.dg_operation_mode == 3 or dg.dg_operation_mode == 4:
 
-                if complete_counter == 1:
-                    dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect_flush()
                 # Write a few more complete states to make sure the complete state items are recorded
                 if complete_counter == 3:
                     f.close()