Index: dialin/ui/hd_simulator.py
===================================================================
diff -u -r8ff49bb248b9b98b18dde057d836b5c2d308922c -r5774d8c42cd71211a5b62ed54e60d490bcb90cad
--- dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision 8ff49bb248b9b98b18dde057d836b5c2d308922c)
+++ dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision 5774d8c42cd71211a5b62ed54e60d490bcb90cad)
@@ -999,7 +999,7 @@
 
     def cmd_set_treatment_states_data(self, sub_mode: int, uf_state: int, saline_state: int, heparing_state: int,
                                       rinseback_state: int, recirculate_state: int, blood_prime_state: int,
-                                      treatment_end_state: int, treamment_stop_state: int) -> None:
+                                      treatment_end_state: int, treatment_stop_state: int, dialysis_state: int) -> None:
         """
         the Treatment States Data message setter/sender method
         | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description           |
@@ -1038,7 +1038,8 @@
         payload += integer_to_bytearray(recirculate_state)
         payload += integer_to_bytearray(blood_prime_state)
         payload += integer_to_bytearray(treatment_end_state)
-        payload += integer_to_bytearray(treamment_stop_state)
+        payload += integer_to_bytearray(treatment_stop_state)
+        payload += integer_to_bytearray(dialysis_state)
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id,
                                               message_id=MsgIds.MSG_ID_TREATMENT_STATE.value,
@@ -1121,7 +1122,6 @@
         payload = integer_to_bytearray(accepted)
         payload += integer_to_bytearray(reason)
         payload += integer_to_bytearray(target)
-        payload += integer_to_bytearray(state)
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id,
                                               message_id=MsgIds.MSG_ID_USER_SALINE_BOLUS_RESPONSE.value,
@@ -1191,7 +1191,6 @@
         """
         payload = integer_to_bytearray(accepted)
         payload += integer_to_bytearray(reason)
-        payload += integer_to_bytearray(state)
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id,
                                               message_id=MsgIds.MSG_ID_HD_HEPARIN_PAUSE_RESUME_RESPONSE.value,
@@ -1251,27 +1250,29 @@
 
         self.can_interface.send(message, 0)
 
-    def cmd_send_treatment_rinseback_data(self, target: float, current: float, rate: int,
-                                          timeout_total: int, timeout_count_down: int) -> None:
+    def cmd_send_treatment_rinseback_data(self, target_vol: float, current_vol: float, flow_rate: int, timeout: int,
+                                          timeout_countdown: int, is_completed: int) -> None:
         """
         the rinseback state change Response message method
-        | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description             | #1:(F32)           | #2:(F32)            | #3:(U32)         | #4:(U32)                 | #5:(U32)                     |
-        |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:            |:--:                |:--:                 |:--:              |:--:                      |:--:                          |
-        |0x5600| 0x020  | 6   | 1Hz    | N   | HD  | UI  | Rinseback progress data | \ref Data::mTarget | \ref Data::mCurrent | \ref Data::mRate | \ref Data::mTimeoutTotal | \ref Data::mTimeoutCountDown |
+        | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description             | #1:(F32)           | #2:(F32)            | #3:(U32)         | #4:(U32)                 | #5:(U32)                     | #5:(U32)                       |
+        |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:            |:--:                |:--:                 |:--:              |:--:                      |:--:                          |:--:                            |
+        |0x5600| 0x020  | 6   | 1Hz    | N   | HD  | UI  | Rinseback progress data | \ref Data::mTarget | \ref Data::mCurrent | \ref Data::mRate | \ref Data::mTimeoutTotal | \ref Data::mTimeoutCountDown | \ref Data::is_completed   |
 
-        @param target: (float) the target  volume in mL
-        @param current: (float) the current volume in mL
-        @param rate: (int) the current flow rate in mL/min
-        @param timeout_total: (int) Total Timeout
-        @param timeout_count_down: (int) Current Timeout count down
-        @return: None
+        :param target_vol           : (float) the target  volume in mL
+        :param current_vol          : (float) the current volume in mL
+        :param flow_rate            : (uint ) the current flow rate in mL/min
+        :param timeout              : (uint ) Total Timeout
+        :param timeout_countdown    : (uint ) Current Timeout count down
+        :param is_completed         : (bool ) Is Rinseback completed.
+        :return: None
         """
 
-        payload = float_to_bytearray(target)
-        payload += float_to_bytearray(current)
-        payload += integer_to_bytearray(rate)
-        payload += integer_to_bytearray(timeout_total)
-        payload += integer_to_bytearray(timeout_count_down)
+        payload  = float_to_bytearray(target_vol)
+        payload += float_to_bytearray(current_vol)
+        payload += integer_to_bytearray(flow_rate)
+        payload += integer_to_bytearray(timeout)
+        payload += integer_to_bytearray(timeout_countdown)
+        payload += integer_to_bytearray(is_completed)
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id,
                                               message_id=MsgIds.MSG_ID_HD_RINSEBACK_PROGRESS.value,
@@ -1458,7 +1459,7 @@
         self.can_interface.send(message, 0)
 
     def cmd_send_version_hd_data(self, major: int, minor: int, micro: int, build: int,
-                                 fpga_id: int, fpga_major: int, fpga_minor: int, fpga_lab: int) -> None:
+                                 fpga_id: int, fpga_major: int, fpga_minor: int, fpga_lab: int, compatibility_rev: int) -> None:
         """
         the hd version response message method
         @param major: integer - Major version number
@@ -1480,6 +1481,7 @@
         payload += byte_to_bytearray(fpga_major)
         payload += byte_to_bytearray(fpga_minor)
         payload += byte_to_bytearray(fpga_lab)
+        payload += integer_to_bytearray(compatibility_rev)
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id,
                                               message_id=MsgIds.MSG_ID_HD_VERSION.value,