Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -r4a751578dd768d849e6ee6dfa1521f5f1597090d -rc887b7a5fcb19a232bab2576693bb4e061b538f0
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 4a751578dd768d849e6ee6dfa1521f5f1597090d)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision c887b7a5fcb19a232bab2576693bb4e061b538f0)
@@ -49,12 +49,12 @@
     // but if the model still needs more the model will fail.
     // so it is better to keep them next to each other to make sure they are in sync.
     // ----
-    {Gui::GuiActionType::ID_PowerOff                                ,   1           }, // 1 byte
+    {Gui::GuiActionType::ID_PowerOff                                ,   1       }, // 1 parameters each 4bytes
     {Gui::GuiActionType::ID_ShuttingDown                            ,   0           },
     {Gui::GuiActionType::ID_TDCheckIn                               ,   0           }, //// ----- @LEAHIZED
 
     // Generic Confirm
-    {Gui::GuiActionType::ID_DuetConfirmHDi                          ,   3 * 4       }, // 3 parameters each 4bytes
+    {Gui::GuiActionType::ID_DuetConfirmTDi                          ,   3 * 4       }, // 3 parameters each 4bytes
     {Gui::GuiActionType::ID_DuetConfirmUIr                          ,   2 * 4       }, // 2 parameters each 4bytes
 
     // POST
Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -rc66898d4ac69b72f1b9cc59e3039e7d9a1e59154 -rc887b7a5fcb19a232bab2576693bb4e061b538f0
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision c66898d4ac69b72f1b9cc59e3039e7d9a1e59154)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision c887b7a5fcb19a232bab2576693bb4e061b538f0)
@@ -526,7 +526,6 @@
     case Gui::GuiActionType::ID_AdjustPatientConnectionConfirmRsp   : ok = notify<Model::MAdjustPatientConnectionConfirmResponse    >(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientConnectionConfirmRsp ); break;
     case Gui::GuiActionType::ID_AdjustStartTreatmentRsp             : ok = notify<Model::MAdjustStartTreatmentResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustStartTreatmentRsp           ); break;
     case Gui::GuiActionType::ID_AdjustWaterSampleData               : ok = notify<Model::MWaterSample                               >(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleData             ); break;
-//    case Gui::GuiActionType::ID_AdjustWaterSampleTimeout            : ok = notify<Model::MAdjustWaterSampleResponse                 >(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleTimeout          ); break;
 
     // ----- In-Treatment - Datum
     case Gui::GuiActionType::ID_TreatmentTime                       : ok = notify<Model::MTreatmentTime                             >(vMessage, vData, Gui::GuiActionType::ID_TreatmentTime                     ); break;
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rc66898d4ac69b72f1b9cc59e3039e7d9a1e59154 -rc887b7a5fcb19a232bab2576693bb4e061b538f0
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision c66898d4ac69b72f1b9cc59e3039e7d9a1e59154)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision c887b7a5fcb19a232bab2576693bb4e061b538f0)
@@ -236,7 +236,7 @@
             ID_TDBatteryData                            = 0x5400, // 84   //// ----- TODO: Payload subject to change given FW implementation
             ID_TDSwitchesData                           = 0x2100, // 33   //// ----- @LEAHIZED
             ID_TDEjectorData                            = 0x4E00, // 78   //// ----- @LEAHIZED
-            ID_TDTemperatureData                        = 0x5300, // 83   //// ----- TODO: Payload subject to change given FW implementation
+            ID_TDTemperatureData                        = 0x5300, // 83   //// ----- @LEAHIZED
             ID_TreatmentParametersSetPointData          = 0x4F00, // 79   //// ----- @LEAHIZED
 
             // Blood Prime
@@ -329,7 +329,7 @@
             ID_AdjustTreatmentLogRsp                    = 0xAA00, // 167
 
             // Treatment Log Data
-            ID_TreatmentLogAvrgeData                    = 0x940F, // 148 //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_TreatmentLogAvrgeData                    = 0xAD00, //
             ID_TreatmentLogAlarmData                    = 0x6A00, // 106  //// ----- @LEAHIZED
             ID_TreatmentLogEventData                    = 0x6B00, // 107  //// ----- @LEAHIZED
 
Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h
===================================================================
diff -u -ra0cb9bd62898c62e33b061228721aad78842404b -rc887b7a5fcb19a232bab2576693bb4e061b538f0
--- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h	(.../MTreatmentAdjustRequests.h)	(revision a0cb9bd62898c62e33b061228721aad78842404b)
+++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h	(.../MTreatmentAdjustRequests.h)	(revision c887b7a5fcb19a232bab2576693bb4e061b538f0)
@@ -382,7 +382,7 @@
  *
  * | MSG  | CAN ID | Type   | Ack | Src | Dst | Description                         |
  * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:                        |
- * |0x8400| 0x100  | Req    | Y   | UI  | TD  | Isolated UF Duration Change Request |
+ * |0x9B00| 0x100  | Req    | Y   | UI  | TD  | Isolated UF Duration Change Request |
  *
  * | Payload  ||
  * |          ||
@@ -406,7 +406,7 @@
  *
  * | MSG  | CAN ID | Type   | Ack | Src | Dst | Description                         |
  * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:                        |
- * |0x8600| 0x100  | Req    | Y   | UI  | TD  | Isolated UF Volume Change Request   |
+ * |0x9D00| 0x100  | Req    | Y   | UI  | TD  | Isolated UF Volume Change Request   |
  *
  * | Payload  ||
  * |          ||
@@ -432,7 +432,7 @@
  *
  * | MSG  | CAN ID | Type   | Ack | Src | Dst | Description                     |
  * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:                    |
- * |0x8800| 0x041  | Req    | Y   | UI  | TD  | Isolated UF Change User Confirm |
+ * |0x9F00| 0x041  | Req    | Y   | UI  | TD  | Isolated UF Change User Confirm |
  *
  * | Payload  ||
  * |          ||