Index: SDDs/Heparin.png
===================================================================
diff -u -r56a4a44268cda59e23ebdbfe2c599f028b4563af -r1edd5fe4e852a2b352a86587820a269a5103fc9f
Binary files differ
Index: SDDs/Heparin.puml
===================================================================
diff -u -r56a4a44268cda59e23ebdbfe2c599f028b4563af -r1edd5fe4e852a2b352a86587820a269a5103fc9f
--- SDDs/Heparin.puml	(.../Heparin.puml)	(revision 56a4a44268cda59e23ebdbfe2c599f028b4563af)
+++ SDDs/Heparin.puml	(.../Heparin.puml)	(revision 1edd5fe4e852a2b352a86587820a269a5103fc9f)
@@ -29,17 +29,17 @@
                     \n\t  - Heparin Delivery Data
     US -> UI: TCH: Press pause/ resume button
     UI -> SW: ACT: Heparin Request
-    SW -> TD: MSG: [xXX: #1]            \
+    SW -> TD: MSG: [x8A: #1]            \
                 \n\tRequest:            \
                 \n\t(U32) requestedState
-    TD -> SW: MSG: [xXX: #2]        \
+    TD -> SW: MSG: [x8B: #2]        \
                 \n\tResponse:       \
                 \n\t(U32)  mAccepted\
                 \n\t(U32)  mReason  
     SW -> UI: ACT: Heparin Response
     UI -> US: ACT: Notify user
     == Heparin Data ==
-    TD -> SW: MSG: [xXX: #3] \nTD Heparin Status Data\n(F32) mCumulative\n(F32) mTarget\n(U32) mTimeRemaining
+    TD -> SW: MSG: [x8C: #3] \nTD Heparin Status Data\n(F32) mCumulative\n(F32) mTarget\n(U32) mTimeRemaining
     SW -> UI: CMD: Update Heparin Data\n(F32) mCumulative\n(F32) mTarget\n(U32) mTimeRemaining
     UI -> US: ACT: Display updated Values
 
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r93b7d7da5dea9e0392e139b59117eb0315d6c343 -r1edd5fe4e852a2b352a86587820a269a5103fc9f
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 93b7d7da5dea9e0392e139b59117eb0315d6c343)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 1edd5fe4e852a2b352a86587820a269a5103fc9f)
@@ -106,12 +106,12 @@
 
             // Service Information
             ID_AdjustServiceDatesReq                    = 0x8900, // 137
-            ID_AdjustServiceDatesHDRsp                  = 0x8A00, // 138
-            ID_AdjustServiceDatesDGRsp                  = 0x8C00, // 140
+            ID_AdjustServiceDatesHDRsp                  = 0x8A0F, // 138 //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_AdjustServiceDatesDGRsp                  = 0x8C0F, // 140 //// ----- @CRAPIZED: had to change to avoid duplication
 
             // HD/DG Usage Counter
             ID_HDUsageInfoReq                           = 0xA000, // 160
-            ID_HDUsageInfoRsp                           = 0x8B00, // 139
+            ID_HDUsageInfoRsp                           = 0x8B0F, // 139 //// ----- @CRAPIZED: had to change to avoid duplication
 
             // RTC
             ID_AdjustHDDateTimeReq                      = 0x6D00, // 109
@@ -136,7 +136,7 @@
             ID_PressureOcclusion                        = 0x2400, // 36     //// ----- @LEAHIZED
             ID_Saline                                   = 0x3D00, // 61     //// ----- @LEAHIZED
             ID_Ultrafiltration                          = 0x3E00, // 62     //// ----- @LEAHIZED
-            ID_Heparin                                  = 0xD900, // 77
+            ID_Heparin                                  = 0x8C00, // 140
             ID_Rinseback                                = 0x5600, // 86
             ID_Recirculate                              = 0x5A00, // 90
             ID_BloodPrime                               = 0x5900, // 89
@@ -252,8 +252,8 @@
             ID_AdjustVitalsReq                          = 0x6300, // 99
             ID_AdjustVitalsRsp                          = 0x6400, // 100
 
-            ID_AdjustHeparinReq                         = 0xD700, // 75
-            ID_AdjustHeparinRsp                         = 0xD800, // 76
+            ID_AdjustHeparinReq                         = 0x8A00, // 138
+            ID_AdjustHeparinRsp                         = 0x8B00, // 139
 
             // Ultrafiltration
             ID_AdjustUltrafiltrationStateReq            = 0x4700, // 71   //// ----- @LEAHIZED
Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.h
===================================================================
diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r1edd5fe4e852a2b352a86587820a269a5103fc9f
--- sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.h	(.../MTreatmentAdjustHeparinResponse.h)	(revision a58f91b077c8131bea3dbde0fc338adb113fc9f3)
+++ sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.h	(.../MTreatmentAdjustHeparinResponse.h)	(revision 1edd5fe4e852a2b352a86587820a269a5103fc9f)
@@ -32,7 +32,7 @@
  *
  * | MSG  | CAN ID | M.Box | Type | Ack | Src | Dest | Description      |
  * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:----------------:|
- * |0x4C00| 0x020  | 6     | Rsp  | Y   | HD  | UI   | Heparin Response |
+ * |0x8B00| 0x020  | 6     | Rsp  | Y   | HD  | UI   | Heparin Response |
  *
  * | Payload  ||
  * |          ||
Index: sources/model/hd/data/treatment/MTreatmentHeparinData.h
===================================================================
diff -u -r8ff1852fbcf348761fd30f878f31fa43ffa9e37c -r1edd5fe4e852a2b352a86587820a269a5103fc9f
--- sources/model/hd/data/treatment/MTreatmentHeparinData.h	(.../MTreatmentHeparinData.h)	(revision 8ff1852fbcf348761fd30f878f31fa43ffa9e37c)
+++ sources/model/hd/data/treatment/MTreatmentHeparinData.h	(.../MTreatmentHeparinData.h)	(revision 1edd5fe4e852a2b352a86587820a269a5103fc9f)
@@ -32,7 +32,7 @@
  *
  * | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description            |
  * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:           |
- * |0x4D00| 0x040  | 7   | 1 Hz   | N   | HD  | All | Treatment Heparin Data |
+ * |0x8C00| 0x040  | 7   | 1 Hz   | N   | HD  | All | Treatment Heparin Data |
  *
  * | Payload  ||
  * |          ||