Index: simulator/plugins/treatmentstates/loader.py
===================================================================
diff -u -rf921975179b1c1ad61d841b9db5976c00432fdcc -r1779b6711f3791e8bf570e06ddb4c2e7d2a52e18
--- simulator/plugins/treatmentstates/loader.py	(.../loader.py)	(revision f921975179b1c1ad61d841b9db5976c00432fdcc)
+++ simulator/plugins/treatmentstates/loader.py	(.../loader.py)	(revision 1779b6711f3791e8bf570e06ddb4c2e7d2a52e18)
@@ -2,13 +2,15 @@
     The Ultrafiltration ui loader
 """
 import os
-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 simulator.dynamicloader import DynamicLoader
+from dialin.ui.hd_simulator import TXStates
+from dialin.ui.hd_simulator import HDSimulator
 
+
 class Loader(DynamicLoader):
     """
     The Ultrafiltration ui loader
@@ -17,9 +19,12 @@
     tblUFStates: QtWidgets.QTableWidget
     tblSalineStates: QtWidgets.QTableWidget
     tblHeparinStates: QtWidgets.QTableWidget
+    tblRinsebackStates: QtWidgets.QTableWidget
+    tblRecirculateStates: QtWidgets.QTableWidget
 
-    def __init__(self):
-        super().__init__(os.path.dirname(__file__))
+    def __init__(self, hd_simulator: HDSimulator):
+        super().__init__(os.path.dirname(__file__), hd_simulator)
+        print(" ---------- ", self.hd_simulator)
 
     def _init_loader(self):
         """
@@ -30,6 +35,8 @@
         self.tblUFStates = self.find_table_widget('tblUFStates')
         self.tblSalineStates = self.find_table_widget('tblSalineStates')
         self.tblHeparinStates = self.find_table_widget('tblHeparinStates')
+        self.tblRinsebackStates = self.find_table_widget('tblRinsebackStates')
+        self.tblRecirculateStates = self.find_table_widget('tblRecirculateStates')
 
     def _init_connections(self):
         """
@@ -40,27 +47,33 @@
         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)
         # apply/send the initial states
-        self.do_treatment_states()
+        # self.do_treatment_states()
 
     def _init_widgets(self):
         """
         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)
+        self.tblRinsebackStates.setCurrentCell(TXStates.HEPARIN_STATE_OFF, 0)
+        self.tblRecirculateStates.setCurrentCell(TXStates.TREATMENT_RECIRC_STOPPED_STATE, 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())
+        rinseback = int(self.tblHeparinStates.verticalHeaderItem(self.tblRinsebackStates.currentRow()).text())
+        recirculate = int(self.tblHeparinStates.verticalHeaderItem(self.tblRecirculateStates.currentRow()).text())
+        self.hd_simulator.cmd_set_treatment_states_data(sub_mode, uf_state, saline, heparin, rinseback, recirculate)