Index: dialin/dg/chemical_disinfect_flush.py
===================================================================
diff -u -r1f6af0afb3388e3a491e1446f336fff9997a3dba -r12d82f9c2f2dda2e322de3b433b7dcee2c557d69
--- dialin/dg/chemical_disinfect_flush.py	(.../chemical_disinfect_flush.py)	(revision 1f6af0afb3388e3a491e1446f336fff9997a3dba)
+++ dialin/dg/chemical_disinfect_flush.py	(.../chemical_disinfect_flush.py)	(revision 12d82f9c2f2dda2e322de3b433b7dcee2c557d69)
@@ -38,6 +38,7 @@
         self.overall_elapsed_time = 0
         self.state_elapsed_time = 0
         self.rinse_count = 0
+        self.cancellation_mode = 0
         self.flush_UI_state = DGChemDisinfectFlushUIStates.CHEM_DISINFECT_FLUSH_UI_STATE_NOT_RUNNING.value
         self.dg_chem_disinfect_flush_timestamp = 0.0
 
@@ -59,7 +60,7 @@
         self.state_elapsed_time = 0
 
     @publish(["dg_chem_disinfect_flush_timestamp","flush_state", "overall_elapsed_time", "state_elapsed_time",
-              "r1", "r2", "target_rinse_count", "rinse_count", "flush_UI_state"])
+              "cancellation_mode", "rinse_count", "flush_UI_state"])
     def _handler_chem_disinfect_flush_sync(self, message: dict, timestamp = 0.0) -> None:
         """
         Handles published flush message
@@ -83,6 +84,7 @@
         self.flush_state = state
         self.overall_elapsed_time = int(elapsed_time / 1000)
         self.state_elapsed_time = int(state_elapsed_time / 1000)
+        self.cancellation_mode = cancellation_mode
         self.rinse_count = rinse_count
         self.flush_UI_state = flush_ui_state
         self.dg_chem_disinfect_flush_timestamp = timestamp
Index: dialin/dg/heat_disinfect.py
===================================================================
diff -u -rd55e08b15b2b4fbd08d16b005db00848372b2a25 -r12d82f9c2f2dda2e322de3b433b7dcee2c557d69
--- dialin/dg/heat_disinfect.py	(.../heat_disinfect.py)	(revision d55e08b15b2b4fbd08d16b005db00848372b2a25)
+++ dialin/dg/heat_disinfect.py	(.../heat_disinfect.py)	(revision 12d82f9c2f2dda2e322de3b433b7dcee2c557d69)
@@ -121,7 +121,8 @@
         self.r2_level = 0
         self.heat_disinfect_ui_state = 0
 
-    @publish(["dg_heat_disinfection_time_timestamp", "heat_disinfect_target_time", "heat_disinfect_count_down_time"])
+    @publish(["dg_heat_disinfection_time_timestamp", "heat_disinfect_target_time", "disinfect_ro_77_time_s","disinfect_ro_82_time_s",
+              "disinfect_r_77_time_s","disinfect_r_82_time_s"])
     def _handler_heat_disinfect_to_ui_sync(self, message, timestamp=0.0):
         """
         Handles published heat disinfect message
@@ -140,11 +141,6 @@
         r_82 = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
 
-        payload = message['message']
-        index = DenaliMessage.PAYLOAD_START_INDEX
-        disinfect_target_time, index = bytearray_to_integer(payload, index, False)
-        disinfect_count_down_time, index = bytearray_to_integer(payload, index, False)
-
         self.heat_disinfect_target_time = int(disinfect_target_time / 1000)
         self.disinfect_ro_77_time_s = ro_77
         self.disinfect_ro_82_time_s = ro_82