Index: HDDefs.h
===================================================================
diff -u -r4735c252d5748ce4bc77d70144de630a68e35813 -r3f8612e051100f56eb5e643a75b68c87d8eef20e
--- HDDefs.h	(.../HDDefs.h)	(revision 4735c252d5748ce4bc77d70144de630a68e35813)
+++ HDDefs.h	(.../HDDefs.h)	(revision 3f8612e051100f56eb5e643a75b68c87d8eef20e)
@@ -689,12 +689,17 @@
     DIALYSATE_FLOW_RATE_CHANGE_EVENT,                                   ///< Dialysate flow rate change event
     TREATMENT_DURATION_CHANGE_EVENT,                                    ///< Treatment duration change event
     UF_VOLUME_CHANGE_EVENT,                                             ///< Ultrafiltration volume change event
-    UF_PAUSE_RESUME_EVENT,                                              ///< Ultrafiltration pause/resume event
+    UF_RATE_CHANGE_EVENT,                                               ///< Ultrafiltration rate change event
+    UF_START_RESUME_EVENT,                                              ///< Ultrafiltration start or resume event
+    UF_PAUSE_EVENT,                                                     ///< Ultrafiltration pause event
     ARTERIAL_PRESSURE_LOWER_LIMIT_CHANGE_EVENT,                         ///< Arterial pressure lower limit change event
     ARTERIAL_PRESSURE_UPPER_LIMIT_CHANGE_EVENT,                         ///< Arterial pressure upper limit change event
     VENOUS_PRESSURE_LOWER_LIMIT_CHANGE_EVENT,                           ///< Venous pressure lower limit change event
     VENOUS_PRESSURE_UPPER_LIMIT_CHANGE_EVENT,                           ///< Venous pressure upper limit change event
-    HEPARIN_PAUSE_RESUME_EVENT,                                         ///< Heparin pause/resume event
+    HEPARIN_BOLUS_START_EVENT,                                          ///< Heparin bolus start event
+    HEPARIN_BOLUS_END_EVENT,                                            ///< Heparin bolus end event
+    HEPARIN_START_RESUME_EVENT,                                         ///< Heparin start or resume event
+    HEPARIN_STOP_PAUSE_EVENT,                                           ///< Heparin stop or pause event
     SALINE_BOLUSES_CHANGE_EVENT,                                        ///< Saline boluses change event
     MID_TREATMENT_RINSE_BACK_EVENT,                                     ///< Mid treatment rinse-back event
     NUM_OF_TX_EVENT_IDS                                                 ///< Total number of treatment events