Index: simulator/plugins/treatmentstates/loader.py
===================================================================
diff -u -rf4523ffcaff0d27f7392c943f0a487fcb01a7d34 -r967521dff94783ce48b50abc8db6bcd67bb501bf
--- simulator/plugins/treatmentstates/loader.py	(.../loader.py)	(revision f4523ffcaff0d27f7392c943f0a487fcb01a7d34)
+++ simulator/plugins/treatmentstates/loader.py	(.../loader.py)	(revision 967521dff94783ce48b50abc8db6bcd67bb501bf)
@@ -9,7 +9,8 @@
 # parent
 from simulator.dynamicloader import DynamicLoader
 # hd Simulator
-from dialin.ui.hd_simulator import HDSimulator, TXStates
+from simulator.interface import SimulationInterface
+from dialin.ui.hd_simulator import TXStates
 # plugin specific
 # -- none --
 
@@ -18,6 +19,7 @@
     """
     The Ultrafiltration ui loader
     """
+    tbSend: QtWidgets.QToolButton
     tbReset: QtWidgets.QToolButton
 
     tblSubMode: QtWidgets.QTableWidget
@@ -30,15 +32,15 @@
     tblTreatmentEndStates: QtWidgets.QTableWidget
     tblTreatmentStopStates: QtWidgets.QTableWidget
 
-    def __init__(self, hd_simulator: HDSimulator):
-        super().__init__(os.path.dirname(__file__), hd_simulator)
-        print(" ---------- ", self.hd_simulator)
+    def __init__(self, interface: SimulationInterface):
+        super().__init__(os.path.dirname(__file__), interface)
 
     def _init_loader(self):
         """
         finds and creates widgets
         :return: none
         """
+        self.tbSend = self.find_tool_button('tbSend')
         self.tbReset = self.find_tool_button('tbReset')
 
         self.tblSubMode = self.find_table_widget('tblSubMode')
@@ -57,16 +59,17 @@
         :return: none
         """
         self.tbReset.clicked.connect(self._init_widgets)
+        self.tbSend.clicked.connect(self.do_treatment_states)
 
-        self.tblSubMode.cellClicked.connect(self.do_treatment_states)
-        self.tblUFStates.cellClicked.connect(self.do_treatment_states)
-        self.tblSalineStates.cellClicked.connect(self.do_treatment_states)
-        self.tblHeparinStates.cellClicked.connect(self.do_treatment_states)
-        self.tblRinsebackStates.cellClicked.connect(self.do_treatment_states)
-        self.tblRecirculateStates.cellClicked.connect(self.do_treatment_states)
-        self.tblBloodPrimeStates.cellClicked.connect(self.do_treatment_states)
-        self.tblTreatmentEndStates.cellClicked.connect(self.do_treatment_states)
-        self.tblTreatmentStopStates.cellClicked.connect(self.do_treatment_states)
+        self.tblSubMode.currentCellChanged.connect(self.do_treatment_states)
+        self.tblUFStates.currentCellChanged.connect(self.do_treatment_states)
+        self.tblSalineStates.currentCellChanged.connect(self.do_treatment_states)
+        self.tblHeparinStates.currentCellChanged.connect(self.do_treatment_states)
+        self.tblRinsebackStates.currentCellChanged.connect(self.do_treatment_states)
+        self.tblRecirculateStates.currentCellChanged.connect(self.do_treatment_states)
+        self.tblBloodPrimeStates.currentCellChanged.connect(self.do_treatment_states)
+        self.tblTreatmentEndStates.currentCellChanged.connect(self.do_treatment_states)
+        self.tblTreatmentStopStates.currentCellChanged.connect(self.do_treatment_states)
         # apply/send the initial states
         # self.do_treatment_states()
 
@@ -77,7 +80,7 @@
         :return: none
         """
         self.tblSubMode.setCurrentCell(TXStates.TREATMENT_START_STATE, 0)
-        self.tblUFStates.setCurrentCell(TXStates.UF_OFF_STATE, 0)
+        self.tblUFStates.setCurrentCell(TXStates.UF_RUNNING_STATE, 0)
         self.tblSalineStates.setCurrentCell(TXStates.SALINE_BOLUS_STATE_IDLE, 0)
         self.tblHeparinStates.setCurrentCell(TXStates.HEPARIN_STATE_OFF, 0)
         self.tblRinsebackStates.setCurrentCell(TXStates.RINSEBACK_STOP_INIT_STATE, 0)
@@ -101,7 +104,7 @@
         blood_prime = int(self.tblBloodPrimeStates.verticalHeaderItem(self.tblBloodPrimeStates.currentRow()).text())
         treatment_end = int(self.tblTreatmentEndStates.verticalHeaderItem(self.tblTreatmentEndStates.currentRow()).text())
         treatment_stop = int(self.tblTreatmentStopStates.verticalHeaderItem(self.tblTreatmentStopStates.currentRow()).text())
-        self.hd_simulator.cmd_set_treatment_states_data(
+        self.interface.hd.cmd_set_treatment_states_data(
             sub_mode,
             uf_state,
             saline,