Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rc0c63c4b149dafea2b02e4cd31f223e392ff7818 -re0412efcf85964a18ec52ad80f233c45998eb45a
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision c0c63c4b149dafea2b02e4cd31f223e392ff7818)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision e0412efcf85964a18ec52ad80f233c45998eb45a)
@@ -104,19 +104,44 @@
             ID_AlarmSilenceReq                  = 0x3200, // 50
             ID_AlarmUserActionReq               = 0x4000, // 64 // there is no response since it is kind of the response to the ID_AlarmStatus from UI to HD
 
-            // Pre-Treatment Parameters
-            ID_CreateTreatmentReq               = 0x3500, // 53
-            ID_CreateTreatmentRsp               = 0x3600, // 54
-            ID_ConfirmTreatmentReq              = 0x3B00, // 59
-            ID_StartTreatmentReq                = 0x3800, // 56
-            ID_StartTreatmentRsp                = 0x3900, // 57
-            // Pre-Treatment Progress Data
-            ID_DGFilterFlush                    = 0x6000, // 96
-            ID_SelfTestNoCartridge              = 0x6100, // 97
-            ID_SelfTestDry                      = 0x6300, // 99
-            ID_DisposablesPrime                 = 0x4300, // 67
+            // Pre-Treatment
+            // Pre-Treatment Initiate Treatment
+            ID_AdjustInitTreatmentReq           = 0x3800, // 56
+            ID_AdjustInitTreatmentRsp           = 0x3900, // 57
+            // Pre-Treatment Parameters Validation/Confirm
+            ID_AdjustParametersValidationReq    = 0x3500, // 53
+            ID_AdjustParametersValidationRsp    = 0x3600, // 54
+            ID_AdjustParametersConfirmReq       = 0x3B00, // 59
+            // Pre-Treatment Water Sample
+            ID_DGFilterFlushData                = 0x6000, // 96
+            ID_AdjustWaterSampleReq             = 0x5D00, // 93
+            ID_AdjustWaterSampleRsp             = 0x5E00, // 94
+            ID_AdjustWaterSampleResultReq       = 0x5F00, // 95  // there is no response and will a response by changing the state in Pre_Treatment_States
+            // Pre-Treatment Consumables Installation Confirm
+            ID_AdjustConsumablesConfirmReq      = 0x6800, // 104 // there is no response and will a response by changing the state in Pre_Treatment_States
+            // Pre-Treatment SelfTest NoCartridge Progress Data
+            ID_SelfTestNoCartridgeData          = 0x6100, // 97  // there is no response and will a response by changing the state in Pre_Treatment_States
+            // Pre-Treatment Disposables Installation Confirm
+            ID_AdjustDisposablesConfirmReq      = 0x6200, // 98  // there is no response and will a response by changing the state in Pre_Treatment_States
+            // Pre-Treatment SelfTest Dry Progress Data
+            ID_SelfTestDryData                  = 0x6300, // 99
+            // Pre-Treatment Disposable Priming
+            ID_AdjustDisposablesPrimeReq        = 0x3C00, // 60
+            ID_AdjustDisposablesPrimeRsp        = 0x3D00, // 61
+            ID_DisposablesPrimeData             = 0x4300, // 67
+            // Pre-Treatment Ultrafiltration initial volume
+            ID_AdjustUltrafiltrationInitReq     = 0x4F00, // 79
+            ID_AdjustUltrafiltrationInitRsp     = 0x5000, // 80
+            // Pre-Treatment Patient Connection Begin
+            ID_AdjustPatientConnectionBeginReq  = 0x6400, // 100
+            ID_AdjustPatientConnectionBeginRsp  = 0x6500, // 101
+            // Pre-Treatment Patient Connection Confirm
+            ID_AdjustPatientConnectionConfirmReq= 0x6600, // 102
+            ID_AdjustPatientConnectionConfirmRsp= 0x6700, // 103
+            // Pre-Treatment Start Treatment
+            ID_AdjustStartTreatmentReq          = 0x7100, // 113
+            ID_AdjustStartTreatmentRsp          = 0x7200, // 114
 
-
             // DG Data Messages
             ID_DGROPumpData                     = 0x1F00, // 31
             ID_DGPressuresData                  = 0x2000, // 32
@@ -145,10 +170,7 @@
             ID_AdjustHeparinReq                 = 0x4B00, // 75
             ID_AdjustHeparinRsp                 = 0x4C00, // 76
 
-            // Ultrafiltration: has also In-Treatment Adjustables but kept together
-            ID_AdjustUltrafiltrationInitReq     = 0x4F00, // 79
-            ID_AdjustUltrafiltrationInitRsp     = 0x5000, // 80
-
+            // Ultrafiltration
             ID_AdjustUltrafiltrationStateReq    = 0x1000, // 16
             ID_AdjustUltrafiltrationStateRsp    = 0x4100, // 65