Index: leahi_dialin/dd/modules/records_set_requests.py
===================================================================
diff -u -r74fa8af6870dbf0faec051c4c3e05576fbfd82ab -r63dcccf308248c312b5f82b65f46605e6d90402d
--- leahi_dialin/dd/modules/records_set_requests.py	(.../records_set_requests.py)	(revision 74fa8af6870dbf0faec051c4c3e05576fbfd82ab)
+++ leahi_dialin/dd/modules/records_set_requests.py	(.../records_set_requests.py)	(revision 63dcccf308248c312b5f82b65f46605e6d90402d)
@@ -610,13 +610,17 @@
                                                eta_low: float=0.0,
                                                zeta_high: float=0.0,
                                                zeta_low: float=0.0,
-                                               beta_high: float=0.0,
-                                               delta_low: float=0.0,
+                                               beta: float=0.0,
+                                               delta: float=0.0,
                                                rsrvd_1: float=0.0,
                                                rsrvd_2: float=0.0,
                                                calibration_time: int=1) -> int:
 
         payload = integer_to_bytearray(sensor_enum.value)
+        if isinstance(sensor_enum, fp_enum_repository.FPConductivitySensorNames):
+            payload = integer_to_bytearray(sensor_enum.value + dd_enum_repository.DDConductivitySensorNames.NUM_OF_CONDUCTIVITY_SENSORS.value)
+        else:
+            payload = integer_to_bytearray(sensor_enum.value)
         payload += float_to_bytearray(k_high)
         payload += float_to_bytearray(alpha_high)
         payload += float_to_bytearray(eta_high)
@@ -625,8 +629,8 @@
         payload += float_to_bytearray(alpha_low)
         payload += float_to_bytearray(eta_low)
         payload += float_to_bytearray(zeta_low)
-        payload += float_to_bytearray(beta_high)
-        payload += float_to_bytearray(delta_low)
+        payload += float_to_bytearray(beta)
+        payload += float_to_bytearray(delta)
         payload += float_to_bytearray(rsrvd_1)
         payload += float_to_bytearray(rsrvd_2)
         payload += integer_to_bytearray(calibration_time)
Index: leahi_dialin/td/modules/alarms.py
===================================================================
diff -u -rba415df9f8e76d6b0f21e8f69ba99346e42f7b09 -r63dcccf308248c312b5f82b65f46605e6d90402d
--- leahi_dialin/td/modules/alarms.py	(.../alarms.py)	(revision ba415df9f8e76d6b0f21e8f69ba99346e42f7b09)
+++ leahi_dialin/td/modules/alarms.py	(.../alarms.py)	(revision 63dcccf308248c312b5f82b65f46605e6d90402d)
@@ -547,8 +547,8 @@
 
         @return: none
         """
-        for x in range(self.alarm_states):
-            self.alarm_states[x] = False
+        for i in range(0, len(self.alarm_states)):
+            self.alarm_states[i] = False
 
 
     def get_dialin_alarms(self):
@@ -558,9 +558,9 @@
         @return: none
         """
         active_alarms = []
-        for x in range(self.alarm_states):
-            if self.alarm_states[x]:
-                active_alarms.append(AlarmList(x))
+        for i in range(0, len(self.alarm_states)):
+            if self.alarm_states[i]:
+                active_alarms.append(AlarmList(i))
         return active_alarms
 
 
Index: leahi_dialin/td/proxies/ui_proxy.py
===================================================================
diff -u -r272d33ed055f9d107788a17a76f2b9bc5bb510aa -r63dcccf308248c312b5f82b65f46605e6d90402d
--- leahi_dialin/td/proxies/ui_proxy.py	(.../ui_proxy.py)	(revision 272d33ed055f9d107788a17a76f2b9bc5bb510aa)
+++ leahi_dialin/td/proxies/ui_proxy.py	(.../ui_proxy.py)	(revision 63dcccf308248c312b5f82b65f46605e6d90402d)
@@ -441,15 +441,16 @@
                              can_interface = self.can_interface)
 
 
-    def cmd_send_ui_initiate_treatment(self, accepted:int = ACCEPTED ) -> None:
+    def cmd_send_ui_initiate_treatment(self, modality: int=0, accepted:int = ACCEPTED ) -> None:
         """
         Constructs and sends a UI initiate treatment message.
 
-        :param accepted: (int) the acceptance value
+        :param modality: (int) The treatment modality, HD = 0, HDF = 1, HD with HDF cartridge = 2
+        :param accepted: (int) The acceptance value
         :return: none
         """
-        acc = integer_to_bytearray(accepted)
-        payload = acc
+        payload = integer_to_bytearray(accepted)
+        payload += integer_to_bytearray(modality)
 
         cmd_generic_override(payload = payload,
                              reset = None,
@@ -474,7 +475,7 @@
         cmd_generic_override(payload = payload,
                              reset = None,
                              channel_id = CanChannels.ui_to_td_ch_id,
-                             msg_id = MsgIds.MSG_ID_UI_TREATMENT_PARAMS_CONFIRMED,
+                             msg_id = MsgIds.MSG_ID_TD_VALIDATED_TREATMENT_PARAMS,
                              entity_name = 'UI Confirm Treatment Parameters',
                              override_text = 'N/A',
                              logger = self.logger,