Index: simulator/plugins/ultrafiltration/loader.py
===================================================================
diff -u -r9206e36aeff354823f2c37103d79f548221cd64c -ra3c7851a7de7cbed6b06abef5033b35308c04c93
--- simulator/plugins/ultrafiltration/loader.py	(.../loader.py)	(revision 9206e36aeff354823f2c37103d79f548221cd64c)
+++ simulator/plugins/ultrafiltration/loader.py	(.../loader.py)	(revision a3c7851a7de7cbed6b06abef5033b35308c04c93)
@@ -1,12 +1,32 @@
 """
+###########################################################################
+#
+# Copyright (c) 2020-2026 Diality Inc. - All Rights Reserved.
+#
+# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+# WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+#
+# @file    loader.py
+#
+# @author  (last)      Behrouz NematiPour
+# @date    (last)      11-Feb-2021
+# @author  (original)  Behrouz NematiPour
+# @date    (original)  23-Nov-2020
+#
+############################################################################
     The Ultrafiltration ui loader
 """
+# 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, EResponse
+# parent
+from simulator.dynamicloader import DynamicLoader
+# hd Simulator
+from dialin.ui.hd_simulator import HDSimulator, TXStates
+# plugin specific
+# -- none --
 
 
 class Loader(DynamicLoader):
@@ -31,8 +51,9 @@
     spnUfResumeRejectReason: QtWidgets.QSpinBox
     sldUfVolume: QtWidgets.QSlider
 
-    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):
         """
@@ -79,8 +100,9 @@
         the slot for accept ultrafiltration pause button
         :return: none
         """
-        denaliMessages.setTreatmentAdjustUltrafiltrationStateResponse(
-            EResponse.Accepted, 0, txStates.UF_PAUSED_STATE)
+        self.hd_simulator.cmd_set_treatment_adjust_ultrafiltration_state_response(
+            True, 0, TXStates.UF_PAUSED_STATE
+        )
         self.lblUfPauseAction.setText('Accepted ')
 
     @Slot()
@@ -90,8 +112,8 @@
         :return: none
         """
         reason = self.spnUfPauseRejectReason.value()
-        denaliMessages.setTreatmentAdjustUltrafiltrationStateResponse(
-            EResponse.Rejected, reason, txStates.UF_RUNNING_STATE)
+        self.hd_simulator.cmd_set_treatment_adjust_ultrafiltration_state_response(
+            False, reason, TXStates.UF_RUNNING_STATE)
         self.lblUfPauseAction.setText('Rejected ' + "{}".format(reason))
 
     @Slot()
@@ -100,8 +122,8 @@
         the slot for accept ultrafiltration resume accept
         :return: none
         """
-        denaliMessages.setTreatmentAdjustUltrafiltrationStateResponse(
-            EResponse.Accepted, 0, txStates.UF_RUNNING_STATE)
+        self.hd_simulator.cmd_set_treatment_adjust_ultrafiltration_state_response(
+            True, 0, TXStates.UF_RUNNING_STATE)
         self.lblUfResumeAction.setText('Accepted ')
 
     @Slot()
@@ -111,8 +133,8 @@
         :return: none
         """
         reason = self.spnUfResumeRejectReason.value()
-        denaliMessages.setTreatmentAdjustUltrafiltrationStateResponse(
-            EResponse.Rejected, reason, txStates.UF_PAUSED_STATE)
+        self.hd_simulator.cmd_set_treatment_adjust_ultrafiltration_state_response(
+            False, reason, TXStates.UF_PAUSED_STATE)
         self.lblUfResumeAction.setText('Rejected ' + "{}".format(reason))
 
     @Slot()
@@ -121,8 +143,8 @@
         the slot for accept ultrafiltration next button
         :return: none
         """
-        denaliMessages.setTreatmentAdjustUltrafiltrationEditResponse(
-            EResponse.Accepted, 0, 2500, 60, 0, 10, 0, 10)
+        self.hd_simulator.cmd_set_treatment_adjust_ultrafiltration_edit_response(
+            True, 0, 2325, 60, 0, 10, 0, 10)
         self.lblUfEditAction.setText('Accepted ')
 
     @Slot()
@@ -132,8 +154,8 @@
         :return: none
         """
         reason = self.spnUfEditRejectReason.value()
-        denaliMessages.setTreatmentAdjustUltrafiltrationEditResponse(
-            EResponse.Rejected, reason, 2500, 60, 0, 10, 0, 10)
+        self.hd_simulator.cmd_set_treatment_adjust_ultrafiltration_edit_response(
+            False, reason, 2500, 60, 0, 10, 0, 10)
         self.lblUfEditAction.setText('Rejected ' + "{}".format(reason))
 
     @Slot()
@@ -142,5 +164,6 @@
         sends the ultrafiltration delivered volume message
         :return: none
         """
-        denaliMessages.setTreatmentUltrafiltration(self.sldUfVolume.value(), 0, 0, 0, 0, 0, 0)
-
+        self.hd_simulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(
+            self.sldUfVolume.value(), 0, 0, 0, 0, 0, 0
+        )