Index: simulator/plugins/treatmentstates/loader.py
===================================================================
diff -u -rf921975179b1c1ad61d841b9db5976c00432fdcc -r310f51a5ed4921f184572f90d07b350ec41c0bae
--- simulator/plugins/treatmentstates/loader.py	(.../loader.py)	(revision f921975179b1c1ad61d841b9db5976c00432fdcc)
+++ simulator/plugins/treatmentstates/loader.py	(.../loader.py)	(revision 310f51a5ed4921f184572f90d07b350ec41c0bae)
@@ -5,8 +5,7 @@
 from simulator.dynamicloader import DynamicLoader
 from PySide2 import QtWidgets
 from PySide2.QtCore import Slot
-from dialin.squish import denaliMessages
-from dialin.squish.denaliMessages import txStates
+from dialin.ui import TXStates
 
 
 class Loader(DynamicLoader):
@@ -48,19 +47,19 @@
         initializes the widgets' properties
         :return: none
         """
-        self.tblSubMode.setCurrentCell(txStates.TREATMENT_DIALYSIS_STATE, 0)
-        self.tblUFStates.setCurrentCell(txStates.UF_OFF_STATE, 0)
-        self.tblSalineStates.setCurrentCell(txStates.SALINE_BOLUS_STATE_IDLE, 0)
-        self.tblHeparinStates.setCurrentCell(txStates.HEPARIN_STATE_OFF, 0)
+        self.tblSubMode.setCurrentCell(TXStates.TREATMENT_DIALYSIS_STATE, 0)
+        self.tblUFStates.setCurrentCell(TXStates.UF_OFF_STATE, 0)
+        self.tblSalineStates.setCurrentCell(TXStates.SALINE_BOLUS_STATE_IDLE, 0)
+        self.tblHeparinStates.setCurrentCell(TXStates.HEPARIN_STATE_OFF, 0)
 
     @Slot()
     def do_treatment_states(self):
         """
         the slot for saline bolus state change
         :return: none
         """
-        sub_mode = self.tblSubMode.verticalHeaderItem(self.tblSubMode.currentRow()).text()
-        uf_state = self.tblUFStates.verticalHeaderItem(self.tblUFStates.currentRow()).text()
-        saline = self.tblSalineStates.verticalHeaderItem(self.tblSalineStates.currentRow()).text()
-        heparin = self.tblHeparinStates.verticalHeaderItem(self.tblHeparinStates.currentRow()).text()
-        denaliMessages.setTreatmentStatesData(sub_mode, uf_state, saline, heparin)
+        sub_mode = int(self.tblSubMode.verticalHeaderItem(self.tblSubMode.currentRow()).text())
+        uf_state = int(self.tblUFStates.verticalHeaderItem(self.tblUFStates.currentRow()).text())
+        saline = int(self.tblSalineStates.verticalHeaderItem(self.tblSalineStates.currentRow()).text())
+        heparin = int(self.tblHeparinStates.verticalHeaderItem(self.tblHeparinStates.currentRow()).text())
+        self.hd_simulator.cmd_set_treatment_states_data(sub_mode, uf_state, saline, heparin)