Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -ra524ef99542bfa8d371835bc7c7d24c68ecf1865 -rc54863854ab063797737c6b3753e00115c0bbd11
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision a524ef99542bfa8d371835bc7c7d24c68ecf1865)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision c54863854ab063797737c6b3753e00115c0bbd11)
@@ -82,7 +82,7 @@
             ID_DuetConfirmUIr                           = 0xBB00, // 187
 
             // POST
-            ID_HDPostSingleResultData                   = 0x8E00, // 142
+            ID_HDPostSingleResultData                   = 0x8E0F, // 142 //// ----- @CRAPIZED: had to change to avoid duplication
             ID_HDPostFinalResultData                    = 0x8F00, // 143
             ID_DGPostSingleResultData                   = 0x9000, // 144
             ID_DGPostFinalResultData                    = 0x9100, // 145
@@ -105,19 +105,19 @@
             ID_AdjustSerialDDRsp                        = 0x5200, // 82     //// ----- @LEAHIZED
 
             // Service Information
-            ID_AdjustServiceDatesReq                    = 0x8900, // 137
-            ID_AdjustServiceDatesHDRsp                  = 0x8A00, // 138
-            ID_AdjustServiceDatesDGRsp                  = 0x8C00, // 140
+            ID_AdjustServiceDatesReq                    = 0x890F, // 137    //// ----- @CRAPIZED: had to change to avoid duplication
+            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
-            ID_AdjustHDDateTimeRsp                      = 0x6E00, // 110
-            ID_AdjustDGDateTimeReq                      = 0x6F00, // 111
-            ID_AdjustDGDateTimeRsp                      = 0x7000, // 112
+            ID_AdjustTDDateTimeReq                      = 0x6C00, // 108
+            ID_AdjustTDDateTimeRsp                      = 0x6D00, // 109
+            ID_AdjustDDDateTimeReq                      = 0x6E00, // 110
+            ID_AdjustDDDateTimeRsp                      = 0x6F00, // 111
             ID_HDRTCEpochData                           = 0x0A0F, // 10     //// ----- @CRAPIZED
 
             // State Messages
@@ -136,7 +136,7 @@
             ID_PressureOcclusion                        = 0x2400, // 36     //// ----- @LEAHIZED
             ID_Saline                                   = 0x3D00, // 61     //// ----- @LEAHIZED
             ID_Ultrafiltration                          = 0x3E00, // 62     //// ----- @LEAHIZED
-            ID_Heparin                                  = 0x4D00, // 77
+            ID_Heparin                                  = 0x8C00, // 140
             ID_Rinseback                                = 0x5600, // 86
             ID_Recirculate                              = 0x5A00, // 90
             ID_BloodPrime                               = 0x5900, // 89
@@ -224,7 +224,7 @@
             // HD Data Messages
             ID_HDAccelerometerData                      = 0x3300, // 51
             ID_HDSyringePumpData                        = 0x6900, // 105
-            ID_HDBloodLeakData                          = 0x6C00, // 108
+            ID_HDBloodLeakData                          = 0x6C0F, // 108  //// ----- @CRAPIZED: had to change to avoid duplication
             ID_TDAirBubbleData                          = 0x1E00, // 30   //// ----- @LEAHIZED
             ID_TDAirPumpData                            = 0x2000, // 32   //// ----- @LEAHIZED
             ID_TDAirTrapData                            = 0x2A00, // 42   //// ----- @LEAHIZED
@@ -252,8 +252,8 @@
             ID_AdjustVitalsReq                          = 0x6300, // 99
             ID_AdjustVitalsRsp                          = 0x6400, // 100
 
-            ID_AdjustHeparinReq                         = 0x4B00, // 75
-            ID_AdjustHeparinRsp                         = 0x4C00, // 76
+            ID_AdjustHeparinReq                         = 0x8A00, // 138
+            ID_AdjustHeparinRsp                         = 0x8B00, // 139
 
             // Ultrafiltration
             ID_AdjustUltrafiltrationStateReq            = 0x4700, // 71   //// ----- @LEAHIZED
@@ -275,8 +275,8 @@
             ID_AdjustRecirculateRsp                     = 0x5500, // 85
 
             // Treatment End
-            ID_AdjustTreatmentEndReq                    = 0x5700, // 87
-            ID_AdjustTreatmentEndRsp                    = 0x5800, // 88
+            ID_AdjustTreatmentEndReq                    = 0x8D00, // 141
+            ID_AdjustTreatmentEndRsp                    = 0x8E00, // 142
 
             // Post-Treatment
             // Patient Disconnect
@@ -303,17 +303,25 @@
             ID_AdjustDisinfectStartRsp                  = 0x8000, // 128
 
             ID_AdjustDGCleaningUsageReq                 = 0xB800, // 184
-            ID_AdjustDGCleaningUsageRsp                 = 0x8D00, // 141
+            ID_AdjustDGCleaningUsageRsp                 = 0x8D0F, // 141    //// ----- @CRAPIZED: had to change to avoid duplication
 
             // RO Water Input Mode
             ID_DuetRoWaterStatDGq                       = 0xC300, // 195 DG -> UI // DG initiates Status query
             ID_DuetRoWaterModeUIi                       = 0xBC00, // 188 UI -> DG // UI initiates Mode Set || responses to status query
             ID_DuetRoWaterModeDGr                       = 0xC400, // 196 UI <- DG // DG responses Mode Set
 
             // Institutional record request and response
-            ID_AdjustInstitutionalRecordReq             = 0xCF00, // 207 UI -> HD request institutional record
-            ID_AdjustInstitutionalRecordRsp             = 0xD000, // 208 HD -> 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           = 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
         };