Index: simulator/plugins/heparin/loader.py
===================================================================
diff -u -r2b0ff4367443cf0458594c81c32598df5b6c39cb -r316fd2f51b0fa89c0f69949d79ef246e1e4bc4ed
--- simulator/plugins/heparin/loader.py	(.../loader.py)	(revision 2b0ff4367443cf0458594c81c32598df5b6c39cb)
+++ simulator/plugins/heparin/loader.py	(.../loader.py)	(revision 316fd2f51b0fa89c0f69949d79ef246e1e4bc4ed)
@@ -1,14 +1,35 @@
 """
+###########################################################################
+#
+# Copyright (c) 2020-2025 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 Heparin ui loader class
 """
-from runtimewidget import RunTimeWidget
+# Python
+import os
+# Qt
 from PySide2 import QtWidgets
 from PySide2.QtCore import Slot
-from dialin.squish import denaliMessages
-from dialin.squish.denaliMessages import txStates
+# parent
+from simulator.dynamicloader import DynamicLoader
+# hd Simulator
+from dialin.ui.hd_simulator import HDSimulator, TXStates
+# plugin specific
+# -- None --
 
 
-class Heparin(RunTimeWidget):
+class Loader(DynamicLoader):
     """
     The Saline Bolus ui loader class
     """
@@ -20,16 +41,14 @@
     spnRejectReason: QtWidgets.QSpinBox
     sldCumulative: QtWidgets.QSlider
 
-    requested_state: txStates
+    requested_state: TXStates
 
-    def __init__(self):
-        super().__init__("plugins/heparin/interface.ui")
-        self.requested_state = txStates.HEPARIN_STATE_PAUSED
-        self.initialize()
-        self.init_widgets()
-        self.init_connections()
+    def __init__(self, hd_simulator: HDSimulator):
+        super().__init__(os.path.dirname(__file__), hd_simulator)
+        print(" ---------- ", self.hd_simulator)
+        self.requested_state = TXStates.HEPARIN_STATE_PAUSED
 
-    def initialize(self):
+    def _init_loader(self):
         """
         finds and creates widgets
         :return: none
@@ -43,14 +62,14 @@
         # saline data
         self.sldCumulative = self.find_slider('sldCumulative')
 
-    def init_widgets(self):
+    def _init_widgets(self):
         """
         initializes the widgets' properties
         :return: none
         """
         pass
 
-    def init_connections(self):
+    def _init_connections(self):
         """
         initializes the widgets connections
         :return:
@@ -68,12 +87,12 @@
         :return: none
         """
         # toggle the requested state
-        if self.requested_state == txStates.HEPARIN_STATE_DISPENSING:
-            self.requested_state = txStates.HEPARIN_STATE_PAUSED
+        if self.requested_state == TXStates.HEPARIN_STATE_DISPENSING:
+            self.requested_state = TXStates.HEPARIN_STATE_PAUSED
         else:
-            self.requested_state = txStates.HEPARIN_STATE_DISPENSING
+            self.requested_state = TXStates.HEPARIN_STATE_DISPENSING
 
-        denaliMessages.setHeparinResponse(True, 0, self.requested_state)
+        self.hd_simulator.cmd_set_heparin_pause_resume_response(True, 0, self.requested_state)
         self.lblAction.setText('Accepted ')
 
     @Slot()
@@ -83,7 +102,7 @@
         :return: none
         """
         reason = self.spnRejectReason.value()
-        denaliMessages.setHeparinResponse(False, reason, self.requested_state)
+        self.hd_simulator.cmd_set_heparin_pause_resume_response(False, reason, self.requested_state)
         self.lblAction.setText('Rejected ' + "{}".format(reason))
 
     @Slot()
@@ -94,5 +113,5 @@
         :return: none
         """
         volume = value * 0.1
-        denaliMessages.setTreatmentHeparinData(volume)
+        self.hd_simulator.cmd_set_treatment_heparin_data(volume)
         self.lblCumulative.setNum(volume)