Index: simulator/plugins/treatmentranges/loader.py
===================================================================
diff -u -rc13dc6ba2410716a3f1c446e564085aeb9114a60 -r316fd2f51b0fa89c0f69949d79ef246e1e4bc4ed
--- simulator/plugins/treatmentranges/loader.py	(.../loader.py)	(revision c13dc6ba2410716a3f1c446e564085aeb9114a60)
+++ simulator/plugins/treatmentranges/loader.py	(.../loader.py)	(revision 316fd2f51b0fa89c0f69949d79ef246e1e4bc4ed)
@@ -1,15 +1,36 @@
 """
+###########################################################################
+#
+# 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)      16-Feb-2021
+# @author  (original)  Behrouz NematiPour
+# @date    (original)  23-Nov-2020
+#
+############################################################################
     The Treatment Ranges ui loader
 """
-from runtimewidget import RunTimeWidget
+# Python
+import os
+# Qt
 from PySide2 import QtWidgets
 from PySide2.QtCore import QTimer
 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
+# plugin specific
+# -- none --
 
 
-class TreatmentRanges(RunTimeWidget):
+class Loader(DynamicLoader):
     """
     The Treatment Ranges ui loader
     """
@@ -24,13 +45,11 @@
     spnUFVolumeMax: QtWidgets.QSpinBox
     sldDurationValue: QtWidgets.QSlider
 
-    def __init__(self):
-        super().__init__("plugins/treatmentranges/interface.ui")
-        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)
 
-    def initialize(self):
+    def _init_loader(self):
         """
         finds and creates widgets
         :return: none
@@ -44,15 +63,16 @@
         self.spnDialysateMax = self.find_spinbox('spnDialysateMax')
         self.chkRangesBroadcast = self.find_checkbox('chkRangesBroadcast')
 
-    def init_connections(self):
+    def _init_connections(self):
         """
         initializes the widgets connections
         :return: none
         """
         self.timer.timeout.connect(self.do_ranges_data)
+        self.timer.timeout.connect(self.do_duration_data)
         self.sldDurationValue.valueChanged.connect(self.do_duration_data)
 
-    def init_widgets(self):
+    def _init_widgets(self):
         """
         initializes the widgets' properties
         :return: none
@@ -61,12 +81,15 @@
         self.timer.start(1000)
 
     @Slot()
-    def do_duration_data(self, value):
+    def do_duration_data(self):
         """
         sends the duration message
         :return: none
         """
-        denaliMessages.setTreatmentTime(self.spnDurationMax.value() * 60, value)
+        value = self.sldDurationValue.value()
+        self.hd_simulator.cmd_set_treatment_time(
+            self.spnDurationMax.value() * 60, value
+        )
 
     @Slot()
     def do_ranges_data(self):
@@ -80,7 +103,7 @@
             self.sldDurationValue.setMinimum(duration_min * 60)
             self.sldDurationValue.setMaximum(duration_max * 60)
 
-            denaliMessages.setTreatmentParamRanges(
+            self.hd_simulator.cmd_set_treatment_parameter_ranges(
                 duration_min,
                 duration_max,
                 self.spnUFVolumeMin.value(),