Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rbd8d4a0e4e5a34b3187f4b472f1eb385d2a24046 -r6e41d2d9f431580bb350db71cc52dd40e60e1a28
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision bd8d4a0e4e5a34b3187f4b472f1eb385d2a24046)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 6e41d2d9f431580bb350db71cc52dd40e60e1a28)
@@ -83,10 +83,10 @@
 
             // POST
             ID_HDPostSingleResultData                   = 0x8E0F, // 142 //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_HDPostFinalResultData                    = 0x8F00, // 143
+            ID_HDPostFinalResultData                    = 0x8F0F, // 143 //// ----- @CRAPIZED
             ID_DGPostSingleResultData                   = 0x900F, // 144 //// ----- @CRAPIZED: had to change to avoid duplication
             ID_DGPostFinalResultData                    = 0x910F, // 145 //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_UIPostFinalResultData                    = 0x920F, // 146 // ID_UIFinalResultTxr - UI Final Result response/Data transmit
+            ID_UIPostFinalResultData                    = 0x920F, // 146 //// ----- @CRAPIZED: had to change to avoid duplication
             ID_UIPostFinalResultHDReq                   = 0xB200, // 178 // ID_HDFinalResultRxq - HD Final Result request       received
 
             // ----- Settings
@@ -138,7 +138,7 @@
             ID_Ultrafiltration                          = 0x3E00, // 62     //// ----- @LEAHIZED
             ID_Heparin                                  = 0x8C00, // 140
             ID_IsolatedUF                               = 0x9A00, // 154
-            ID_Rinseback                                = 0x5600, // 86
+            ID_Rinseback                                = 0x8F00, // 143    //// ----- @LEAHIZED
             ID_Recirculate                              = 0x5A00, // 90
             ID_BloodPrime                               = 0x5900, // 89
             ID_TreatmentStop                            = 0x4900, // 73
@@ -173,8 +173,8 @@
             // Pre-Treatment SelfTest NoCartridge Progress Data
             ID_SelfTestNoCartridgeData                  = 0x6100, // 97  // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
             // Pre-Treatment Disposables Installation Confirm
-            ID_AdjustDisposablesConfirmReq              = 0x6200, // 98  // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
-            ID_AdjustDisposablesConfirmRsp              = 0xAD00, // 173 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
+            ID_AdjustDisposablesConfirmReq              = 0x9200, // 146  // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
+            ID_AdjustDisposablesConfirmRsp              = 0x9300, // 147 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
             // Pre-Treatment SelfTest Dry Progress Data
             ID_SelfTestDryData                          = 0x630F, // 99     //// ----- @CRAPIZED: had to change to avoid duplication
             // Pre-Treatment Disposable Priming
@@ -294,8 +294,8 @@
 
             // End-Treatment
             // Rinseback
-            ID_AdjustRinsebackReq                       = 0x520F, // 82 //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_AdjustRinsebackRsp                       = 0x530F, // 83 //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_AdjustRinsebackReq                       = 0x9000, // 144  //// ----- @LEAHIZED
+            ID_AdjustRinsebackRsp                       = 0x9100, // 145  //// ----- @LEAHIZED
 
             // Recirculate
             ID_AdjustRecirculateReq                     = 0x540F, // 84 //// ----- @CRAPIZED: had to change to avoid duplication
@@ -312,8 +312,8 @@
             ID_AdjustPatientDisconnectConfirmRsp        = 0x7E0F, // 126    //// ----- @CRAPIZED: had to change to avoid duplication
 
             // Disposables Removal
-            ID_AdjustDisposablesRemovalConfirmReq       = 0x730F, // 115 //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_AdjustDisposablesRemovalConfirmRsp       = 0x740F, // 116 //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_AdjustDisposablesRemovalConfirmReq       = 0x9400, // 148
+            ID_AdjustDisposablesRemovalConfirmRsp       = 0x9500, // 149
 
             // Treatment Log Adjs
             ID_AdjustTreatmentLogReq                    = 0x750F, // 117 //// ----- @CRAPIZED: had to change to avoid duplication