Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -rb6d23ac9f339d36f9c68000ecc59dcc07fec8838 -r2124420a19819f672e9180979ff3762dc083eb7f
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision b6d23ac9f339d36f9c68000ecc59dcc07fec8838)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 2124420a19819f672e9180979ff3762dc083eb7f)
@@ -78,8 +78,7 @@
     // ----
     {Gui::GuiActionType::ID_HDOperationModeData                     ,   2 * 4       }, // 2 parameter  each 4bytes
     {Gui::GuiActionType::ID_PreTreatmentStates                      ,   9 * 4       }, // 9 parameters each 4bytes
-    {Gui::GuiActionType::ID_TreatmentStates                         ,   9 * 4       }, // 9 parameters each 4bytes
-    {Gui::GuiActionType::ID_TreatmentStates                         ,   1 * 4       }, // 1 parameter  each 4bytes
+    {Gui::GuiActionType::ID_TreatmentStates                         ,  10 * 4       }, // 9 parameters each 4bytes
     {Gui::GuiActionType::ID_PostTreatmentStates                     ,   1 * 4       }, // 1 parameter  each 4bytes
     {Gui::GuiActionType::ID_DisinfectStates                         ,   3 * 4       }, // 3 parameter  each 4bytes
 
@@ -94,7 +93,7 @@
     {Gui::GuiActionType::ID_DGLoadCellReadingsData                  ,   4 * 4       }, //  4 parameters each 4bytes
     {Gui::GuiActionType::ID_DGTemperaturesData                      ,  12 * 4       }, // 12 parameters each 4bytes
     {Gui::GuiActionType::ID_DGAccelerometerData                     ,   9 * 4       }, //  9 parameters each 4bytes
-    {Gui::GuiActionType::ID_DGConductivityData                      ,   4 * 4       }, //  9 parameters each 4bytes
+    {Gui::GuiActionType::ID_DGConductivityData                      ,   5 * 4       }, //  9 parameters each 4bytes
     // HD Data Messages
     {Gui::GuiActionType::ID_HDAccelerometerData                     ,   9 * 4       }, // 9 parameters each 4bytes
     {Gui::GuiActionType::ID_HDSyringePumpData                       ,   9 * 4       }, // 9 parameters each 4bytes
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r2d37cfe6593a90633a9db1fa5136f8fc43b56188 -r2124420a19819f672e9180979ff3762dc083eb7f
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 2d37cfe6593a90633a9db1fa5136f8fc43b56188)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 2124420a19819f672e9180979ff3762dc083eb7f)
@@ -193,6 +193,7 @@
             ID_DGTemperaturesData                       = 0x2D00, // 45
             ID_DGAccelerometerData                      = 0x3400, // 52
             ID_DGConductivityData                       = 0x3100, // 49
+
             // HD Data Messages
             ID_HDAccelerometerData                      = 0x3300, // 51
             ID_HDSyringePumpData                        = 0x6900, // 105
Index: sources/gui/qml/AlarmItem.qml
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r2124420a19819f672e9180979ff3762dc083eb7f
--- sources/gui/qml/AlarmItem.qml	(.../AlarmItem.qml)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/gui/qml/AlarmItem.qml	(.../AlarmItem.qml)	(revision 2124420a19819f672e9180979ff3762dc083eb7f)
@@ -41,6 +41,7 @@
     readonly property alias text           : vAlarmStatus.text
     readonly property alias isSilenced     : vAlarmStatus.alarm_Flag_alarmsSilenced
     readonly property alias timeout        : vAlarmStatus.alarm_MuteTimeout
+    readonly property alias alarm_AlarmID  : vAlarmStatus.alarm_AlarmID
 
     function clearAlarm() {
         vAlarmStatus.doClearCondition()
Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml
===================================================================
diff -u -r34861b44547037950fcf398accc7649f7fac4529 -r2124420a19819f672e9180979ff3762dc083eb7f
--- sources/gui/qml/dialogs/DiagnosticsDialog.qml	(.../DiagnosticsDialog.qml)	(revision 34861b44547037950fcf398accc7649f7fac4529)
+++ sources/gui/qml/dialogs/DiagnosticsDialog.qml	(.../DiagnosticsDialog.qml)	(revision 2124420a19819f672e9180979ff3762dc083eb7f)
@@ -540,7 +540,7 @@
         y: row(6)
         title: qsTr(" Alarms ")
         model: [
-            vAlarmStatus.alarm_AlarmID,
+            _alarmItem.alarm_AlarmID,
         ]
         label: [
             "Top" ,
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r30a3a58cde0e82d66c8c5f242ec550007e20b694 -r2124420a19819f672e9180979ff3762dc083eb7f
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 30a3a58cde0e82d66c8c5f242ec550007e20b694)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 2124420a19819f672e9180979ff3762dc083eb7f)
@@ -27,7 +27,6 @@
 import VHDBloodLeak                                         0.1
 import VHDAirTrap                                           0.1
 import VHDAirBubble                                         0.1
-import VAlarmStatus                                         0.1
 // POST
 import VHDPOSTData                                          0.1
 import VDGPOSTData                                          0.1
@@ -151,7 +150,7 @@
         interval    : vTreatmentCreate.bloodPressureMeasureInterval
     }
 
-    VAlarmStatus                                        { id: vAlarmStatus                                          }
+
     VTreatmentDialysateFlow                             { id: vTreatmentDialysateFlow                               }
     VTreatmentPressureOcclusion                         { id: vTreatmentPressureOcclusion                           }
     VTreatmentUltrafiltration                           { id: vTreatmentUltrafiltration                             }
Index: sources/model/dg/data/MDGConductivityData.h
===================================================================
diff -u -r968c7861b6caf1906c6b3ac34ae13018c6f1bf2b -r2124420a19819f672e9180979ff3762dc083eb7f
--- sources/model/dg/data/MDGConductivityData.h	(.../MDGConductivityData.h)	(revision 968c7861b6caf1906c6b3ac34ae13018c6f1bf2b)
+++ sources/model/dg/data/MDGConductivityData.h	(.../MDGConductivityData.h)	(revision 2124420a19819f672e9180979ff3762dc083eb7f)
@@ -29,9 +29,9 @@
  * \brief   The MDGConductivityData class
  * \details The DG conductivity sensors data model
  *
- * | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description           |
- * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:          |
- * |0x3100| 0x080  | 8   | 1 Hz   | N   | DG  | All | DG Conductivity Data  |
+ * | MSG  | CAN ID | Type   | Ack | Src | Dst | Description           |
+ * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:          |
+ * |0x3100| 0x080  | 1 Hz   | N   | DG  | All | DG Conductivity Data  |
  *
  * | Payload  ||
  * |          ||
Index: sources/model/hd/data/MHDAirBubbleData.h
===================================================================
diff -u -r968c7861b6caf1906c6b3ac34ae13018c6f1bf2b -r2124420a19819f672e9180979ff3762dc083eb7f
--- sources/model/hd/data/MHDAirBubbleData.h	(.../MHDAirBubbleData.h)	(revision 968c7861b6caf1906c6b3ac34ae13018c6f1bf2b)
+++ sources/model/hd/data/MHDAirBubbleData.h	(.../MHDAirBubbleData.h)	(revision 2124420a19819f672e9180979ff3762dc083eb7f)
@@ -31,9 +31,9 @@
  * \brief   The MHDAirBubbleData class
  * \details The HD Air Bubble data model
  *
- * | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description           |
- * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:          |
- * |0x9300| 0x080  | 8   | 1 Hz   | N   | DG  | All | HD Air Bubble Data    |
+ * | MSG  | CAN ID | Type   | Ack | Src | Dst | Description           |
+ * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:          |
+ * |0x9300| 0x080  | 1 Hz   | N   | DG  | All | HD Air Bubble Data    |
  *
  * | Payload  ||
  * |          ||
Index: sources/model/hd/data/MHDAirTrapData.h
===================================================================
diff -u -r968c7861b6caf1906c6b3ac34ae13018c6f1bf2b -r2124420a19819f672e9180979ff3762dc083eb7f
--- sources/model/hd/data/MHDAirTrapData.h	(.../MHDAirTrapData.h)	(revision 968c7861b6caf1906c6b3ac34ae13018c6f1bf2b)
+++ sources/model/hd/data/MHDAirTrapData.h	(.../MHDAirTrapData.h)	(revision 2124420a19819f672e9180979ff3762dc083eb7f)
@@ -31,9 +31,9 @@
  * \brief   The MHDAirTrapData class
  * \details The HD Air Trap data model
  *
- * | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description        |
- * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:       |
- * |0x3E00| 0x080  | 8   | 1 Hz   | N   | DG  | All | HD Air Trap Data   |
+ * | MSG  | CAN ID | Type   | Ack | Src | Dst | Description        |
+ * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:       |
+ * |0x3E00| 0x080  | 1 Hz   | N   | DG  | All | HD Air Trap Data   |
  *
  * | Payload  ||
  * |          ||
Index: sources/model/hd/data/MHDBloodLeakData.h
===================================================================
diff -u -r968c7861b6caf1906c6b3ac34ae13018c6f1bf2b -r2124420a19819f672e9180979ff3762dc083eb7f
--- sources/model/hd/data/MHDBloodLeakData.h	(.../MHDBloodLeakData.h)	(revision 968c7861b6caf1906c6b3ac34ae13018c6f1bf2b)
+++ sources/model/hd/data/MHDBloodLeakData.h	(.../MHDBloodLeakData.h)	(revision 2124420a19819f672e9180979ff3762dc083eb7f)
@@ -32,9 +32,9 @@
  * \details The HD blood leak data model
  *
  *
- * |   MSG  | CAN ID | M.Box | Type | Ack | Src | Dest | Description            |
- * |:------:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------: |
- * | 0x6C00 | 0x040  | 7     | 1 Hz | N   | HD  | UI   | HD Blood Leak Data     |
+ * |   MSG  | CAN ID | Type | Ack | Src | Dest | Description            |
+ * |:------:|:------:|:----:|:---:|:---:|:----:|:---------------------: |
+ * | 0x6C00 | 0x040  | 1 Hz | N   | HD  | UI   | HD Blood Leak Data     |
  *
  * | Payload  ||
  * |          ||