Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h
===================================================================
diff -u -r1da0c41020664b642359f3cd5d58a2fdc36774a2 -r024129d0aa4be9de46b0b223d2980a7be4747f15
--- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h	(.../MTreatmentAdjustRequests.h)	(revision 1da0c41020664b642359f3cd5d58a2fdc36774a2)
+++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h	(.../MTreatmentAdjustRequests.h)	(revision 024129d0aa4be9de46b0b223d2980a7be4747f15)
@@ -151,15 +151,21 @@
  *
  * | Payload  ||
  * |          ||
- * | #1:(U32) | \ref duration |
+ * | #1:(U32) | \ref duration           |
+ * | #2:(U32) | \ref heparinDuration    |
+ * | #3:(F32) | \ref rate               |
  *
  */
 class MAdjustDurationConfirmReq : public MModel {
 public:
-    quint32 duration = 0;
+    quint32 duration        = 0;
+    quint32 heparinDuration = 0;
+    float   rate            = 0;
 
     QString toString() {
-        return toString({duration});
+        return toString({duration,
+                         heparinDuration,
+                         rate});
     }
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("AdjustDurationConfirm", vParameters);
@@ -176,23 +182,42 @@
  *
  * | Payload  ||
  * |          ||
- * | #1:(U32) | \ref bloodFlowRate          |
- * | #2:(U32) | \ref dialysateFlowRate      |
- * | #3:(F32) | \ref dialysateTemperature   |
- * | #4:(U32) | \ref acidConcentrate        |
- * | #5:(U32) | \ref bicarbConcentrate      |
+ * | #1:(U32) | \ref bloodFlowRate                      |
+ * | #2:(U32) | \ref dialysateFlowRate                  |
+ * | #3:(F32) | \ref dialysateTemperature               |
+ * | #4:(U32) | \ref acidConcentrate                    |
+ * | #5:(F32) | \ref acidConcentrateConversionFactor    |
+ * | #6:(U32) | \ref bicarbConcentrate                  |
+ * | #7:(U32) | \ref treatmentModality                  |
+ * | #8:(U32) | \ref hepatitus                          |
+ * | #9:(U32) | \ref sodium                             |
+ * | #10:(U32)| \ref bicarbonate                        |
  *
  */
 class MAdjustSetPointsReq : public MModel {
 public:
-    quint32 bloodFlowRate           = 0;
-    quint32 dialysateFlowRate       = 0;
-    float   dialysateTemperature    = 0;
-    quint32 acidConcentrate         = 0;
-    quint32 bicarbConcentrate       = 0;
+    quint32 bloodFlowRate                   = 0;
+    quint32 dialysateFlowRate               = 0;
+    float   dialysateTemperature            = 0;
+    quint32 acidConcentrate                 = 0;
+    float   acidConcentrateConversionFactor = 0;
+    quint32 bicarbConcentrate               = 0;
+    quint32 treatmentModality               = 0;
+    quint32 hepatitus                       = 0;
+    quint32 sodium                          = 0;
+    quint32 bicarbonate                     = 0;
 
     QString toString() {
-        return toString({bloodFlowRate, dialysateFlowRate, dialysateTemperature, acidConcentrate, bicarbConcentrate});
+        return toString({   bloodFlowRate,
+                            dialysateFlowRate,
+                            dialysateTemperature,
+                            acidConcentrate,
+                            acidConcentrateConversionFactor,
+                            bicarbConcentrate,
+                            treatmentModality,
+                            hepatitus,
+                            sodium,
+                            bicarbonate});
     }
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("AdjustSetPointsReq", vParameters);
@@ -329,20 +354,22 @@
  *
  * | MSG  | CAN ID | Type   | Ack | Src | Dst | Description                 |
  * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:                |
- * |0x6600| 0x041  | Req    | Y   | UI  | HD  | UF Vol. Change User Confirm |
+ * |0x6600| 0x041  | Req    | Y   | UI  | TD  | UF Vol. Change User Confirm |
  *
  * | Payload  ||
  * |          ||
  * | #1:(F32) | \ref volume |
+ * | #2:(F32) | \ref rate   |
  *
  * \sa Options
  *
  */
 class MAdjustUltrafiltrationConfirmReq : public MModel {
 public:
-    float   volume = 0;
+    float   volume  = 0;
+    float   rate    = 0;
     QString toString() {
-        return toString({volume});
+        return toString({volume, rate});
     }
     static QString toString(const QVariantList &vParameters) {
         return MModel::toString("AdjustUFConfirm", vParameters);
@@ -355,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  ||
  * |          ||
@@ -379,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  ||
  * |          ||
@@ -405,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  ||
  * |          ||
@@ -440,7 +467,7 @@
  */
 class MAdjustSalineReq : public MModel {
 public:
-    GuiSalineCommands requestedState = GuiSalineCommands::SALINE_CMD_STOP; // the requested state. Initially it's Stop => start.
+    GuiSalineCommands requestedState = GuiSalineCommands::FLUID_BOLUS_CMD_STOP; // the requested state. Initially it's Stop => start.
     QString toString() {
         return toString({requestedState});
     }
@@ -536,25 +563,25 @@
  *
  * | MSG  | CAN ID | Type | Ack | Src | Dest | Description                 |
  * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------------------:|
- * |0x4600| 0x100  | Req  | Y   | UI  | TD   | A/V BP Limit Change Request |
+ * |0x7200| 0x100  | Req  | Y   | UI  | TD   | A/V BP Limit Change Request |
  *
  * | Payload  |||
  * |          |||
- * | #1:(S32) | \ref mArterialPressureLimitWindow | (mmHg) |
- * | #2:(S32) | \ref mVenousPressureLimitWindow   | (mmHg) |
- * | #3:(S32) | \ref mVenousPressureLimitAsymtrc  | (mmHg) |
- * | #4:(S32) | \ref mTmpPressureLimitWindow      | (mmHg) |
+ * | #1:(U32) | \ref mArterialPressureLimitWindow | (mmHg) |
+ * | #2:(U32) | \ref mVenousPressureLimitWindow   | (mmHg) |
+ * | #3:(U32) | \ref mVenousPressureLimitAsymtrc  | (mmHg) |
+ * | #4:(U32) | \ref mTmpPressureLimitWindow      | (mmHg) |
  *
  * \sa MPressureOcclusion       : Pressure data broadcast
  * \sa MAdjustPressuresResponse : Pressures limit adjustment response
  *
  */
 class MAdjustPressuresLimitsReq : public MModel {
 public:
-    qint32 mArterialPressureLimitWindow = 0; ///< (S32) Arterial Pressure Limit Window      (mmHg)
-    qint32 mVenousPressureLimitWindow   = 0; ///< (S32) Venous Pressure Limit Window        (mmHg)
-    qint32 mVenousPressureLimitAsymtrc  = 0; ///< (S32) Venous Pressure Limit Asymmetric    (mmHg)
-    qint32 mTmpLimitWindow              = 0; ///< (S32) Transmembrane Pressure Limit Window (mmHg)
+    quint32 mArterialPressureLimitWindow = 0; ///< (U32) Arterial Pressure Limit Window      (mmHg)
+    quint32 mVenousPressureLimitWindow   = 0; ///< (U32) Venous Pressure Limit Window        (mmHg)
+    quint32 mVenousPressureLimitAsymtrc  = 0; ///< (U32) Venous Pressure Limit Asymmetric    (mmHg)
+    quint32 mTmpLimitWindow              = 0; ///< (U32) Transmembrane Pressure Limit Window (mmHg)
 
     QString toString() {
         return toString