Index: SDDs/Institutional.png
===================================================================
diff -u -rc43d24c50f4344348d36d8ae9273797f4557356a -r27b99dbeb5a45c3e154d668c5b92d2f874f745ba
Binary files differ
Index: SDDs/Institutional.puml
===================================================================
diff -u -rc43d24c50f4344348d36d8ae9273797f4557356a -r27b99dbeb5a45c3e154d668c5b92d2f874f745ba
--- SDDs/Institutional.puml	(.../Institutional.puml)	(revision c43d24c50f4344348d36d8ae9273797f4557356a)
+++ SDDs/Institutional.puml	(.../Institutional.puml)	(revision 27b99dbeb5a45c3e154d668c5b92d2f874f745ba)
@@ -105,8 +105,8 @@
         UI -> US: ACT: Notify User 
     end
     == Institutional Settings Request ==
-    SW -> TD: MSG: [xXX: #0] Request: Institutional Records
-    TD -> SW: MSG: [xXX: #60]  (U32)  mAccepted         \
+    SW -> TD: MSG: [x82: #0] Request: Institutional Records
+    TD -> SW: MSG: [x83: #60]  (U32)  mAccepted         \
                                 \n (U32)  mReason                       \
                                 \n (U32)  mBloodFlowMin                \
                                 \n (U32)  mBloodFlowMax                \
@@ -167,7 +167,7 @@
                                 \n (F32)  mSubstitutionVolumeMax       \
                                 \n (F32)  mSubstitutionVolumeDef   
     == Institutional Settings Adjustment ==
-    SW -> TD: MSG: [xXX: #58]  Adjust Request \n (U32)  mBloodFlowMin                \
+    SW -> TD: MSG: [x84: #58]  Adjust Request \n (U32)  mBloodFlowMin                \
                                 \n (U32)  mBloodFlowMax                \
                                 \n (U32)  mBloodFlowDef                \
                                 \n (U32)  mDialysateFlowMin            \
@@ -225,7 +225,7 @@
                                 \n (F32)  mSubstitutionVolumeMin       \
                                 \n (F32)  mSubstitutionVolumeMax       \
                                 \n (F32)  mSubstitutionVolumeDef   
-    TD -> SW: MSG: [xXX: #59]  Rejection Reasons : \n(U32)  mAccepted         \
+    TD -> SW: MSG: [x85: #59]  Rejection Reasons : \n(U32)  mAccepted         \
                                 \n (U32)  mBloodFlowRateMinRejectionReason                      \
                                 \n (U32)  mBloodFlowRateMaxRejectionReason                      \
                                 \n (U32)  mBloodFlowRateDefRejectionReason                      \
@@ -285,8 +285,8 @@
                                 \n (U32)  mSubstitutionVolumeMaxRejectionReason                 \
                                 \n (U32)  mSubstitutionVolumeDefRejectionReason             
     == Advanced Institutional Settings Request ==
-    SW -> TD: MSG: [xXX: #0] Request: Advanced Institutional Records
-    TD -> SW: MSG: [xXX: #24]  (U32)  mAccepted         \
+    SW -> TD: MSG: [x86: #0] Request: Advanced Institutional Records
+    TD -> SW: MSG: [x87: #24]  (U32)  mAccepted         \
                                 \n (U32) mReason                                 \
                                 \n (U32) mMinRORejectionRatioAlarmMin            \
                                 \n (U32) mMinRORejectionRatioAlarmMax            \
@@ -311,7 +311,7 @@
                                 \n (U32) mChlorineWaterSampleCheckDef            \
                                 \n (U32) mWaterSampleTestResultRequiredDef       
     == Advanced Institutional Settings Adjustment ==
-    SW -> TD: MSG: [xXX: #22]  Request: Adjust Advanced Institutional Records   \
+    SW -> TD: MSG: [x88: #22]  Request: Adjust Advanced Institutional Records   \
                                 \n (U32) mMinRORejectionRatioAlarmMin            \
                                 \n (U32) mMinRORejectionRatioAlarmMax            \
                                 \n (U32) mMinRORejectionRatioAlarmDef            \
@@ -334,7 +334,7 @@
                                 \n (U32) mChlorineWaterSampleCheckMax            \
                                 \n (U32) mChlorineWaterSampleCheckDef            \
                                 \n (U32) mWaterSampleTestResultRequiredDef    
-    TD -> SW: MSG: [xXX: #23]  Rejection Reasons : \n(U32)  mAccepted         \
+    TD -> SW: MSG: [x89: #23]  Rejection Reasons : \n(U32)  mAccepted         \
                         \n (U32) mMinRORejectionRatioAlarmMaxRejectionReason        \
                         \n (U32) mMinRORejectionRatioAlarmMinRejectionReason        \
                         \n (U32) mMinRORejectionRatioAlarmDefRejectionReason        \
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rc43d24c50f4344348d36d8ae9273797f4557356a -r27b99dbeb5a45c3e154d668c5b92d2f874f745ba
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision c43d24c50f4344348d36d8ae9273797f4557356a)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 27b99dbeb5a45c3e154d668c5b92d2f874f745ba)
@@ -105,7 +105,7 @@
             ID_AdjustSerialDDRsp                        = 0x5200, // 82     //// ----- @LEAHIZED
 
             // Service Information
-            ID_AdjustServiceDatesReq                    = 0x8900, // 137
+            ID_AdjustServiceDatesReq                    = 0x890F, // 137    //// ----- @CRAPIZED: had to change to avoid duplication
             ID_AdjustServiceDatesHDRsp                  = 0x8A00, // 138
             ID_AdjustServiceDatesDGRsp                  = 0x8C00, // 140
 
@@ -311,16 +311,16 @@
             ID_DuetRoWaterModeDGr                       = 0xC400, // 196 UI <- DG // DG responses Mode Set
 
             // Institutional record request and response
-            ID_InstitutionalRecordReq                   = 0xCF00, // 207 UI -> TD request institutional record
-            ID_InstitutionalRecordRsp                   = 0xD000, // 208 TD -> UI response institutional record
-            ID_AdjustInstitutionalRecordReq             = 0xD100, // 207 UI -> TD request institutional record
-            ID_AdjustInstitutionalRecordRsp             = 0xD200, // 208 TD -> UI response institutional record
+            ID_InstitutionalRecordReq                   = 0x8200, // 130 UI -> TD request institutional record
+            ID_InstitutionalRecordRsp                   = 0x8300, // 131 TD -> UI response institutional record
+            ID_AdjustInstitutionalRecordReq             = 0x8400, // 132 UI -> TD request institutional record
+            ID_AdjustInstitutionalRecordRsp             = 0x8500, // 133 TD -> UI response institutional record
 
             // Advanced Institutional record request and response
-            ID_AdvancedInstitutionalRecordReq           = 0xD300, // 207 UI -> TD request institutional record
-            ID_AdvancedInstitutionalRecordRsp           = 0xD400, // 208 TD -> UI response institutional record
-            ID_AdjustAdvancedInstitutionalRecordReq     = 0xD500, // 207 UI -> TD request institutional record
-            ID_AdjustAdvancedInstitutionalRecordRsp     = 0xD600, // 208 TD -> UI response institutional record
+            ID_AdvancedInstitutionalRecordReq           = 0x8600, // 134 UI -> TD request institutional record
+            ID_AdvancedInstitutionalRecordRsp           = 0x8700, // 135 TD -> UI response institutional record
+            ID_AdjustAdvancedInstitutionalRecordReq     = 0x8800, // 136 UI -> TD request institutional record
+            ID_AdjustAdvancedInstitutionalRecordRsp     = 0x8900, // 137 TD -> UI response institutional record
 
             // HD reset request in service mode
             ID_ResetHDInServiceModeReq                  = 0xB900, // 185 UI -> HD reset in service mode
Index: sources/model/td/adjustment/settings/MAdjustTDAdvancedInstitutionalRecordResponse.h
===================================================================
diff -u -rc43d24c50f4344348d36d8ae9273797f4557356a -r27b99dbeb5a45c3e154d668c5b92d2f874f745ba
--- sources/model/td/adjustment/settings/MAdjustTDAdvancedInstitutionalRecordResponse.h	(.../MAdjustTDAdvancedInstitutionalRecordResponse.h)	(revision c43d24c50f4344348d36d8ae9273797f4557356a)
+++ sources/model/td/adjustment/settings/MAdjustTDAdvancedInstitutionalRecordResponse.h	(.../MAdjustTDAdvancedInstitutionalRecordResponse.h)	(revision 27b99dbeb5a45c3e154d668c5b92d2f874f745ba)
@@ -32,7 +32,7 @@
  *
  * | MSG  | CAN ID | Type | Ack | Src | Dest | Description |
  * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:|
- * |0xD000| 0x020  | Rsp  | Y   | HD  | UI   | Service Mode |
+ * |0x8900| 0x020  | Rsp  | Y   | HD  | UI   | Service Mode |
  *
  * | Payload   ||
  * |           ||
Index: sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.h
===================================================================
diff -u -rc43d24c50f4344348d36d8ae9273797f4557356a -r27b99dbeb5a45c3e154d668c5b92d2f874f745ba
--- sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.h	(.../MAdjustTDInstitutionalRecordResponse.h)	(revision c43d24c50f4344348d36d8ae9273797f4557356a)
+++ sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.h	(.../MAdjustTDInstitutionalRecordResponse.h)	(revision 27b99dbeb5a45c3e154d668c5b92d2f874f745ba)
@@ -32,7 +32,7 @@
  *
  * | MSG  | CAN ID | Type | Ack | Src | Dest | Description |
  * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:|
- * |0xD000| 0x020  | Rsp  | Y   | HD  | UI   | Service Mode |
+ * |0x8500| 0x020  | Rsp  | Y   | HD  | UI   | Service Mode |
  *
  * | Payload   ||
  * |           ||
Index: sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.h
===================================================================
diff -u -rc43d24c50f4344348d36d8ae9273797f4557356a -r27b99dbeb5a45c3e154d668c5b92d2f874f745ba
--- sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.h	(.../MTDAdvancedInstitutionalRecordResponse.h)	(revision c43d24c50f4344348d36d8ae9273797f4557356a)
+++ sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.h	(.../MTDAdvancedInstitutionalRecordResponse.h)	(revision 27b99dbeb5a45c3e154d668c5b92d2f874f745ba)
@@ -32,7 +32,7 @@
  *
  * | MSG  | CAN ID | Type | Ack | Src | Dest | Description |
  * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:|
- * |0xD000| 0x020  | Rsp  | Y   | HD  | UI   | Service Mode |
+ * |0x8700| 0x020  | Rsp  | Y   | HD  | UI   | Service Mode |
  *
  * | Payload   ||
  * |           ||
Index: sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.h
===================================================================
diff -u -rc43d24c50f4344348d36d8ae9273797f4557356a -r27b99dbeb5a45c3e154d668c5b92d2f874f745ba
--- sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.h	(.../MTDInstitutionalRecordResponse.h)	(revision c43d24c50f4344348d36d8ae9273797f4557356a)
+++ sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.h	(.../MTDInstitutionalRecordResponse.h)	(revision 27b99dbeb5a45c3e154d668c5b92d2f874f745ba)
@@ -32,7 +32,7 @@
  *
  * | MSG  | CAN ID | Type | Ack | Src | Dest | Description |
  * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:|
- * |0xD000| 0x020  | Rsp  | Y   | HD  | UI   | Service Mode |
+ * |0x8300| 0x020  | Rsp  | Y   | HD  | UI   | Service Mode |
  *
  * | Payload   ||
  * |           ||