Index: dialin/ui/hd_simulator.py
===================================================================
diff -u -rf39effbe4c532bc0a472afec5596f2943b22f459 -r143b55a0ae82aa3481f560a33696fb8e7dae4056
--- dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision f39effbe4c532bc0a472afec5596f2943b22f459)
+++ dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision 143b55a0ae82aa3481f560a33696fb8e7dae4056)
@@ -1672,7 +1672,8 @@
                                              sodium_concentration: int,
                                              dialysate_temperature: float,
                                              dialyzer_type: int,
-                                             treatment_date_time: int,
+                                             treatment_start_date_time: int,
+                                             treatment_end_date_time: int,
                                              average_blood_flow: float,
                                              average_dialysate_flow: float,
                                              dialysate_volume_used: float,
@@ -1682,15 +1683,12 @@
                                              target_uf_rate: float,
                                              actual_uf_rate: float,
                                              saline_bolus_volume: int,
-                                             heparin_type: int,
-                                             heparin_concentration: int,
                                              heparin_bolus_volume: float,
                                              heparin_dispense_rate: float,
                                              heparin_pre_stop: int,
                                              heparin_delivered_volume: float,
                                              average_arterial_pressure: float,
                                              average_venous_pressure: float,
-                                             end_treatment_early_alarm: int,
                                              device_id: int,
                                              water_sample_test_result: int
                                              ) -> None:
@@ -1710,7 +1708,8 @@
         :param sodium_concentration: sodium concentration
         :param dialysate_temperature: dialysate temperature
         :param dialyzer_type: dialyzer type
-        :param treatment_date_time: treatment date time
+        :param treatment_start_date_time: treatment start date time
+        :param treatment_end_date_time: treatment end date time
         :param average_blood_flow: average blood flow
         :param average_dialysate_flow: average dialysate flow
         :param dialysate_volume_used: dialysate volume used
@@ -1748,7 +1747,8 @@
         payload += unsigned_to_bytearray(int(sodium_concentration))
         payload += float_to_bytearray(float(dialysate_temperature))
         payload += unsigned_to_bytearray(int(dialyzer_type))
-        payload += unsigned_to_bytearray(int(treatment_date_time))
+        payload += unsigned_to_bytearray(int(treatment_start_date_time))
+        payload += unsigned_to_bytearray(int(treatment_end_date_time))
         payload += float_to_bytearray(float(average_blood_flow))
         payload += float_to_bytearray(float(average_dialysate_flow))
         payload += float_to_bytearray(float(dialysate_volume_used))
@@ -1758,15 +1758,12 @@
         payload += float_to_bytearray(float(target_uf_rate))
         payload += float_to_bytearray(float(actual_uf_rate))
         payload += unsigned_to_bytearray(int(saline_bolus_volume))
-        payload += unsigned_to_bytearray(int(heparin_type))
-        payload += unsigned_to_bytearray(int(heparin_concentration))
         payload += float_to_bytearray(float(heparin_bolus_volume))
         payload += float_to_bytearray(float(heparin_dispense_rate))
         payload += unsigned_to_bytearray(int(heparin_pre_stop))
         payload += float_to_bytearray(float(heparin_delivered_volume))
         payload += float_to_bytearray(float(average_arterial_pressure))
         payload += float_to_bytearray(float(average_venous_pressure))
-        payload += unsigned_to_bytearray(int(end_treatment_early_alarm))
         payload += unsigned_to_bytearray(int(device_id))
         payload += unsigned_to_bytearray(int(water_sample_test_result))