Index: simulator/plugins/salinebolus/loader.py
===================================================================
diff -u -r1779b6711f3791e8bf570e06ddb4c2e7d2a52e18 -rf4523ffcaff0d27f7392c943f0a487fcb01a7d34
--- simulator/plugins/salinebolus/loader.py	(.../loader.py)	(revision 1779b6711f3791e8bf570e06ddb4c2e7d2a52e18)
+++ simulator/plugins/salinebolus/loader.py	(.../loader.py)	(revision f4523ffcaff0d27f7392c943f0a487fcb01a7d34)
@@ -1,13 +1,17 @@
 """
 The Saline Bolus ui loader class
 """
+# Python
 import os
-from simulator.dynamicloader import DynamicLoader
+# Qt
 from PySide2 import QtWidgets
 from PySide2.QtCore import Slot
-from dialin.squish import denaliMessages
-from dialin.squish.denaliMessages import txStates
-from dialin.ui.hd_simulator import HDSimulator
+# parent
+from simulator.dynamicloader import DynamicLoader
+# hd Simulator
+from dialin.ui.hd_simulator import HDSimulator, TXStates
+# plugin specific
+# -- none --
 
 
 class Loader(DynamicLoader):
@@ -24,12 +28,12 @@
     sldSalineCumulative: QtWidgets.QSlider
     sldSalineVolume: QtWidgets.QSlider
 
-    saline_requested_state: txStates
+    saline_requested_state: TXStates
 
     def __init__(self, hd_simulator: HDSimulator):
         super().__init__(os.path.dirname(__file__), hd_simulator)
         print(" ---------- ", self.hd_simulator)
-        self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IDLE
+        self.saline_requested_state = TXStates.SALINE_BOLUS_STATE_IDLE
 
     def _init_loader(self):
         """
@@ -74,13 +78,15 @@
         :return: none
         """
         # toggle the saline requested state
-        if self.saline_requested_state == txStates.SALINE_BOLUS_STATE_IN_PROGRESS:
-            self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IDLE
+        if self.saline_requested_state == TXStates.SALINE_BOLUS_STATE_IN_PROGRESS:
+            self.saline_requested_state = TXStates.SALINE_BOLUS_STATE_IDLE
         else:
-            self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IN_PROGRESS
+            self.saline_requested_state = TXStates.SALINE_BOLUS_STATE_IN_PROGRESS
 
         target = self.cmbSalineAcceptTarget.currentText()
-        denaliMessages.setSalineBolusResponse(True, 0, target, self.saline_requested_state)
+        self.hd_simulator.cmd_set_saline_bolus_response(
+            True, 0, int(target), self.saline_requested_state
+        )
         self.lblSalineAction.setText('Accepted ' + target)
 
     @Slot()
@@ -90,17 +96,20 @@
         :return: none
         """
         reason = self.spnSalineRejectReason.value()
-        denaliMessages.setSalineBolusResponse(False, reason, 0, self.saline_requested_state)
+        self.hd_simulator.cmd_set_saline_bolus_response(
+            False, reason, 0, self.saline_requested_state
+        )
         self.lblSalineAction.setText('Rejected ' + "{}".format(reason))
 
-
     @Slot()
     def do_saline_data(self):
         """
         the slot which is called to send the saline bolus data
         by calling the denaliMessage API setTreatmentSalineBolusData
         :return: none
         """
-        denaliMessages.setTreatmentSalineBolusData(self.sldSalineTarget.value(),
-                                                   self.sldSalineCumulative.value(),
-                                                   self.sldSalineVolume.value())
+        self.hd_simulator.cmd_set_treatment_saline_bolus_data(
+            self.sldSalineTarget.value(),
+            self.sldSalineCumulative.value(),
+            self.sldSalineVolume.value()
+        )