Index: suite_leahi/shared/scripts/configuration/config.py
===================================================================
diff -u -r5242b0f3bde261dff5670b39bdb263f084d237b6 -rc091cb2bd9bd4b20538496aa27435e8c8cf39e7a
--- suite_leahi/shared/scripts/configuration/config.py	(.../config.py)	(revision 5242b0f3bde261dff5670b39bdb263f084d237b6)
+++ suite_leahi/shared/scripts/configuration/config.py	(.../config.py)	(revision c091cb2bd9bd4b20538496aa27435e8c8cf39e7a)
@@ -90,19 +90,11 @@
 ACTIVE          = 'Active'
 RESUME          = 'Resume'
 COMPLETE        = 'Complete'
-HEPARIN         = 'Heparin'
-CREATERX        = 'Rx'
-VALIDATE        = 'VALIDATE'
-CONFIRM         = 'CONFIRM'
-NEXT            = 'Next'
-AUTO_LOAD       = 'Auto Load'
-WATER_SAMPLE    = 'Water Sample'
-START           = 'Start'
-AUTO_EJECT      = 'Auto Eject'
-ISOLATED_UF_VOLUME_REMOVED = "Isolated UF Volume Removed"
-ISOLATED_UF_VOLUME_GOAL    ="Isolated UF Volume Goal"
-ULTRAFILTRATION_PAUSED_STATE = "Ultrafiltration Paused"
-ULTRAFILTRATION_COMPLETE_STATE = "Ultrafiltration Complete"
+HEPARIN         = "Heparin"
+CREATERX        = "Rx"
+VALIDATE        = "VALIDATE"
+CONFIRM         = "CONFIRM"
+NEXT            ="Next"
 
 SYSTOLIC                    = "Systolic"
 DIASTOLIC                   = "Diastolic"
Index: suite_leahi/shared/scripts/configuration/navigation.py
===================================================================
diff -u -r8bfb02b2b8e50dccd822549c11d340df033744c7 -rc091cb2bd9bd4b20538496aa27435e8c8cf39e7a
--- suite_leahi/shared/scripts/configuration/navigation.py	(.../navigation.py)	(revision 8bfb02b2b8e50dccd822549c11d340df033744c7)
+++ suite_leahi/shared/scripts/configuration/navigation.py	(.../navigation.py)	(revision c091cb2bd9bd4b20538496aa27435e8c8cf39e7a)
@@ -30,38 +30,6 @@
             ),
         )
         
-def navigate_to_device_settings_using_service_password():
-    td_simulator.td_operation_mode(TDOpModes.MODE_STAN.value, 0)
-    main_menu_container = squish.waitForObject(names.o_mainMenu_MainMenu, 2000)
-    squish.mouseClick(utility.findChildByText(main_menu_container, config.SETTINGS))
-        
-    td_simulator.td_operation_mode(TDOpModes.MODE_SERV.value, 0)
-    grid_container = squish.waitForObject(names.o_DeviceSettingsGrid)
-    squish.mouseClick(utility.findChildByText(grid_container, config.SERVICE))
-
-    input_field = squish.waitForObject(names.o_userConfirmation_TextInput, 1000)
-
-    squish.type(input_field, config.DEFAULT_SERVICE_PASSWORD_RAW)
-    confirm_button = squish.waitForObject(names.o_userConfirmation_ConfirmButton, 1000)
-    squish.mouseClick(confirm_button)
-        
-def get_ini_value(conf_path: str , section: str, key: str):
-    """
-    Method to get the advanced option from the System.conf file
-    """
-    path = Path(conf_path)
-    if not path.exists():
-        raise FileNotFoundError(f"Not found: {path}")
-    parser = ConfigParser()
-    # Preserve case if needed:
-    # parser.optionxform = str
-    parser.read(path, encoding="utf-8")
-    if not parser.has_section(section):
-        raise KeyError(f"Section [{section}] not found in {path}")
-    if not parser.has_option(section, key):
-        raise KeyError(f"Key '{key}' not found in section [{section}]")
-    return parser.get(section, key)
-        
 def navigation_pageIndicator_step(vStep_name):
     """
         Navigate to the specified page using the step indicator component.
@@ -73,20 +41,10 @@
          
     """
     test.startSection("Method to navigation in the pretreatment page ")
-    stepId    = squish.waitForObjectExists(names.o_preTreatmentStack_stepIndicator_StepIndicator)
-    stepnames = utility.findAllObjectsById(stepId, "_text")
-    SYSTEM_PATH = application_init.configuration_folder_path() + "Settings/System.conf"
-    value     = get_ini_value(SYSTEM_PATH, section ="AdvancedMode", key ="AdvancedMode")
-    standard  = stepnames[1:] 
-    if value == "0":
-        standard   = stepnames[3:] 
-        Nextbutton = utility.setObjectText(obj =names.o_preTreatmentStack_Text, text =config.NEXT)
-        squish.mouseClick(squish.waitForObject(Nextbutton))
-
-    autoLoadbutton = utility.setObjectText(obj =names.o_preTreatmentStack_Text, text ="Auto Load")
-    squish.mouseClick(squish.waitForObject(autoLoadbutton))
-    td_simulator.td_blood_set_auto_load_response(vRejectionReason = 0)
-    for input_field in standard:
+    stepId = squish.waitForObjectExists(names.o_preTreatmentStack_stepIndicator_StepIndicator)
+    values = utility.findAllObjectsById(stepId, "_text")
+    for index, input_field in enumerate(values[2:]):
+        test.log(str(index));
         test.log(str(input_field.text))
         if str(input_field.text) == "Water Sample":
             squish.mouseClick(squish.waitForObject(names.o_PreTreatmentSampleStack_button_TouchRect))
@@ -98,3 +56,4 @@
             squish.mouseClick(Nextbutton)
         
     test.endSection() 
+    
\ No newline at end of file
Index: suite_leahi/shared/scripts/configuration/utility.py
===================================================================
diff -u -r8bfb02b2b8e50dccd822549c11d340df033744c7 -rc091cb2bd9bd4b20538496aa27435e8c8cf39e7a
--- suite_leahi/shared/scripts/configuration/utility.py	(.../utility.py)	(revision 8bfb02b2b8e50dccd822549c11d340df033744c7)
+++ suite_leahi/shared/scripts/configuration/utility.py	(.../utility.py)	(revision c091cb2bd9bd4b20538496aa27435e8c8cf39e7a)
@@ -12,61 +12,10 @@
 from builtins                     import int as pyInt
 
 td =TD_Messaging()
-
-def aut(*args):
-    """
-    Joins the executable name and argument 
-    into a single command string
-* Options:
- *   -h, --help                           Displays help on commandline options.
- *   --help-all                           Displays help including Qt specific
- *                                        options.
- *   -v, --version                        Displays version information.
- *   -c, --canOut                         Show the Can Frame Output
- *   -m, --msgOut                         Show the Message Output
- *   -l, --logOut                         Show the Logs Output
- *   -0, --enable-keep-awake              Enable send low priority, empty message
- *                                        on the CANBus just to keep UI board CAN
- *                                        driver awake
- *   -i, --fake-interval <interval>       Test fake message interval(ms)
- *   -f, --fake-message <data>            Test fake message data
- *                                        will use default sequenced long fake
- *                                        message if set to 00(default)
- *                                        will used only if correct integer value
- *                                        assigned for interval option
- *   -b, --fake-message-seq-at-begin      Test fake message sequence at the
- *                                        beginning of the frame
- *   -u, --disable-unhandled-report       Disable unhandled messages report as an
- *                                        error in the log
- *   -d, --disable-dialin-unhandled       Disable the Dialin messages logged as
- *                                        unhandled
- *   -q, --disable-timeout                Disables communication timeout
- *   -a, --disable-alarm-no-minimize      Disables alarm no minimize
- *   -S, --disable-sd-card-fail-log-stop  disable-sd-card-fail-log-stop
- *   -C, --disable-cloudsync-fail-stop    disable-cloudsync-fail-stop
- *   -k, --disable-check-in-log           Disables Check-In Log
- *   -K, --disable-acknow-log             Disables Acknowledgment Log
- *   -D, --enable-dry-demo                Enables Dry-Demo Mode
- *   -A, --active-can-bus <CANBus>        Sets the Active CANBus [Shall start with
- *                                        'can' or 'vcan]
- *   -E, --enable-manufacturing           Enables the manufacturing mode to
- *                                        configure the system for the first time.
- *   -R, --use-root-home                  In case the application is not in
- *                                        Manufacturing Setup but needs to use root
- *                                        home folder for configurations.
- *   -U, --enable-update-mode             Enables the update mode to update only
- *                                        necessary files during the update and
- *                                        keep the rest.
- *   -x, --use-log-long-name              Use the log long file name format
- *                                        <date>_<time>_<serial>_<mode>
- *   -y, --use-log-cloud-upload           Use the log cloud upload
- *   -z, --use-log-compression            Use the log compression
- *   -L, --use-log-unhandled-only         Use the unhandled messages only to log
-    """
-    return " ".join(('leahi', *args))
-
+from leahi_dialin.ui import utils
+from builtins import int as pyInt
    
-def get_object_from_names(names_dict, error_message = "Missing object", timeout_ms = 3000):
+def get_object_from_names(names_dict, error_message = "Missing object", timeout_ms = 200):
     """
         To get an object with try..except catching to prevent script errors when the object is not found on the GUI
         @param names_dict - the dictionary element from the names.py file (ie: names.some_variable_name_of_element)
@@ -188,7 +137,72 @@
             return True
     return False # default return if not successful
 
+def verify_create_treatment_parameters():
+    test.startSection("Pre treatment parameters")
+    navigation.navigation_pageIndicator_step(config.CREATERX)
+    squish.mouseClick(squish.waitForObject(names.o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry))
+    squish.waitForObject(names.o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry).text ="abcd"
+    set_value_based_on_target(names.o_PreTreatmentCreate_bloodFlowRateControl_ValueAdjuster, 60)
+    set_value_based_on_target(names.o_PreTreatmentCreate_dialysateFlowRateControl_ValueAdjuster, 75)
+    set_value_based_on_target(names.o_PreTreatmentCreate_durationControl_ValueAdjuster, 75)
+    set_value_based_on_target(names.o_PreTreatmentCreate_heparinBolusVolumeControl_ValueAdjuster, 0.4)
+    set_value_based_on_target(names.o_PreTreatmentCreate_heparinDispensingRateControl_ValueAdjuster, 0.5)
+    set_value_based_on_target(names.o_PreTreatmentCreate_heparinStopTimeControl_ValueAdjuster, 60)
+    select_different_dropdown(names.o_PreTreatmentCreate_acidConcentrateComboBox_BaseComboBox,config.ACID_CONCENTRATE,2)
+    set_value_based_on_target(names.o_PreTreatmentCreate_dialysateTemperatureControl_ValueAdjuster,37.0)
+    select_different_dropdown(names.o_PreTreatmentCreate_dialyzerTypeComboBox_BaseComboBox,config.DIALYZER_TYPE,2)
+    set_value_based_on_target(names.o_PreTreatmentCreate_salineBolusVolumeControl_ValueAdjuster, 200)
+    select_different_dropdown(names.o_PreTreatment_vitalsCombobox_BaseCombobox,config.VITALS,1)
+    select_different_dropdown(names.o_PreTreatmentCreate_bicarbonateConcentrateComboBox_BaseComboBox,config.BICARBONATE,0)
+    Validatebutton = setObjectText(obj = names.o_preTreatmentStack_Text, text =config.VALIDATE)
+    squish.mouseClick(squish.waitForObject(Validatebutton))
+    td.td_Treatment_Parameters_Validation(  vAccepted                                    = 1,
+                                            vBloodFlowRateRejectReason                   = 0,
+                                            vDialysateFlowRateRejectReason               = 0,
+                                            vTreatmentDurationRejectReason               = 0,
+                                            vSalineBolusVolumeRejectReason               = 0,
+                                            vHeparinStopTimeRejectReason                 = 0,
+                                            vHeparinTypeRejectReason                     = 0,
+                                            vAcidConcentrateRejectReason                 = 0,
+                                            vBicarbonateConcentrateRejectReason          = 0,
+                                            vDialyzerTypeRejectReason                    = 0,
+                                            vBloodPressureMeasureIntervalRejectReason    = 0,
+                                            vRinsebackFlowRateRejectReason               = 0,
+                                            vRinsebackVolumeRejectReason                 = 0,
+                                            vArterialPressureLimitWindowRejectReason     = 0,
+                                            vVenousPressureLimitWindowRejectReason       = 0,
+                                            vVenousPressureLimitAsymtrcRejectReason      = 0,
+                                            vTransmembranePressureLimitWindowRejectReason  = 0,
+                                            vDialysateTempRejectReason                   = 0,
+                                            vHeparinDispensingRateRejectReason           = 0,
+                                            vHeparinBolusVolumeRejectReason              = 0
+                                           )
+    
+    confirmButton = setObjectText(obj = names.o_preTreatmentStack_Text,text = config.CONFIRM )
+    squish.mouseClick(squish.waitForObject(confirmButton))
+    test.endSection()
+    
+def findAllObjectsById(parent, target_id):
+    """
+    Recursively finds all child objects by their id property.
+    Returns a list of all matching objects found.
+    """
+    results = []
+    
+    # Use hasattr to safely check for 'id' property
+    if hasattr(parent, 'id') and str(parent.id) == target_id:
+        results.append(parent)
+
+    # Recurse through all children to collect all instances
+    for child in object.children(parent):
+        results.extend(findAllObjectsById(child, target_id))
+
+    return results
  
+
+
+
+
 def set_value_with_slider(value_field_obj, slider_obj,parameter):
     """
     Opens the slider and moves it gradually to the target value (step of 10).
Index: suite_leahi/shared/scripts/names.py
===================================================================
diff -u -r5242b0f3bde261dff5670b39bdb263f084d237b6 -rc091cb2bd9bd4b20538496aa27435e8c8cf39e7a
--- suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 5242b0f3bde261dff5670b39bdb263f084d237b6)
+++ suite_leahi/shared/scripts/names.py	(.../names.py)	(revision c091cb2bd9bd4b20538496aa27435e8c8cf39e7a)
@@ -272,237 +272,21 @@
 o_SettingsBase_heparinSyringePumpSwitch_BaseSwitch              = {"checkable": True, "container": o_SettingsBase_SettingsFeatureConfigurations,         "id": "_heparinSyringePumpSwitch",                                                                                                                     "type": "BaseSwitch",                                                 "unnamed": 1           }
 o_vitalsButton_VitalsButton                                     = {"container": o_Gui_MainView,                                                          "id": "_vitalsButton",                                                                                                                                 "type": "VitalsButton",                                               "unnamed": 1           }
 o_vitalsPopup_Close_Image                                       = {"container": o_Overlay,                                                               "id": "_image", "source": "qrc:/images/iClose",                                                                                                        "type": "Image",                                                      "unnamed": 1           }
-
-#end of treatment
-o_cancelTouch_TouchRect                                                 = {"container": o_Overlay,                                                               "id": "_cancelTouch",                                                                                                                                  "type": "TouchRect",                                                 "unnamed": 1                             }
-o_treatmentCompleteButton_TreatmentCompleteButton                       = {"container": o_Gui_MainView,                                                          "id": "_treatmentCompleteButton",                                                                                                                      "type": "TreatmentCompleteButton",                                   "unnamed": 1                             }
-o_treatmentHome_iconImage_Image                                         = {"container": mainTreatmentScreen,                                                     "id": "_iconImage",                                                "source": "qrc:/images/iEditDisabled",                                              "type": "Image",                                                     "unnamed": 1                             }
-o_treatmentHome_editButton_IconButton                                   = {"container": mainTreatmentScreen,                                                     "id": "_editButton",                                                                                                                                   "type": "IconButton",                                                "unnamed": 1                             }
-o_vitalsButton_VitalsButton                                             = {"container": o_Gui_MainView,                                                          "id": "_vitalsButton",                                                                                                                                 "type": "VitalsButton",                                              "unnamed": 1                             }
-o_isolatedUfButton_TouchRect                                            = {"container": o_Overlay,                                                                                                                                  "objectName": "_isolatedUfButton",                                                  "type": "TouchRect"                                                                                           }
-o_pauseResumeButton_TouchRect                                           = {"container": o_Overlay,                                                                                                                                  "objectName": "_pauseResumeButton",                                                 "type": "TouchRect"                                                                                           }
-o_treatmentHome_editButton_IconButton_2                                 = {"container": mainTreatmentScreen,                                                     "id": "_editButton",                                                                                                                                   "type": "IconButton",                                                "unnamed": 1                             }
-o_image_Image                                                           = {"container": o_Overlay,                                                               "id": "_image", "source": "qrc:/images/iClose",                                                                                                        "type": "Image",                                                     "unnamed": 1                             }
-o_treatmentHome_upArrowIcon_ArrowButton                                 = {"container": mainTreatmentScreen,                                                                                                                        "objectName": "upArrowIcon",                                                        "type": "ArrowButton"                                                                                         }
-o_treatmentHome_downArrowIcon_ArrowButton                               = {"container": mainTreatmentScreen,                                                                                                                        "objectName": "downArrowIcon",                                                      "type": "ArrowButton"                                                                                         }
-o_confirmTouch_ConfirmButton                                            = {"container": o_Overlay,                                                               "id": "_confirmTouch",                                                                                                                                 "type": "ConfirmButton",                                             "unnamed": 1                             }
-o_bloodPressureSystolic_TextEntry                                       = {"container": o_Overlay,                                                               "id": "_bloodPressureSystolic",                                                                                                                        "type": "TextEntry",                                                 "unnamed": 1                             }
-o_bloodPressureDiastolic_TextEntry                                      = {"container": o_Overlay,                                                               "id": "_bloodPressureDiastolic",                                                                                                                       "type": "TextEntry",                                                 "unnamed": 1                             }
-o_heartRate_TextEntry                                                   = {"container": o_Overlay,                                                               "id": "_heartRate",                                                                                                                                    "type": "TextEntry",                                                 "unnamed": 1                             }
-o_confirm_button                                                        = {"container": o_Overlay,                                                               "id": "_confirmButton",                                                                                                                                "type": "ConfirmButton",                                             "unnamed": 1                             }
-keyboard_input                                                          = {"container": o_Overlay,                                                                                                                                                                                                                      "type": "Text",                                                      "unnamed": 1                             } 
-o_treatmentHome_bloodPressure_LabelValue                                = {"container": mainTreatmentScreen,                                                     "id": "_bloodPressure",                                                                                                                                "type": "LabelValue",                                                "unnamed": 1                             }
-o_treatmentHome_heartBeat_LabelValue                                    = {"container": mainTreatmentScreen,                                                     "id": "_heartBeat",                                                                                                                                    "type": "LabelValue",                                                "unnamed": 1                             }                              
-o_preTreatmentStack_repeater_Repeater                                   = {"container": o_preTreatmentStack_PreTreatmentStack,                                   "id": "repeater",                                                                                                                                      "type": "Repeater",                                                  "unnamed": 1                             }
-o_preTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSample     = {"container": o_preTreatmentStack_PreTreatmentStack,                                                                                                  "objectName": "_PreTreatmentSampleStack",                                               "type": "PreTreatmentWaterSample"                                                                             }
-o_PreTreatmentSampleStack_failContainer_WaterSampleContainer            = {"container": o_preTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSample,    "id": "_failContainer",                                                                                                                                 "type": "WaterSampleContainer",                                      "unnamed": 1                             }
-o_PreTreatmentSampleStack_button_TouchRect                              = {"container": o_preTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSample,    "id": "_button",                                                                                                                                        "type": "TouchRect",                                                 "unnamed": 1                             }
-o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom   = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_bpMeasurementIntervalControl",                                                                                                                  "type": "ValueAdjusterCustom",                                       "unnamed": 1                             }
-#The `visible` property must remain in place. It ensures the element is rendered and interactable; without it, the element may not be clickable, which impactsboth user interaction and automated test execution.
-o_preTreatmentStack_confirmButton_ConfirmButton                         = {"container": o_preTreatmentStack_PreTreatmentStack,                                                                                                  "objectName": "_confirmButton",                                                         "type": "ConfirmButton",                                             "visible": True                          }
-
-# Service Institutional
-o_Row_Object                                                    = {                                                                                      "id": "_row",                                                                                                                                          "type": "Row",                                                        "unnamed": 1           }
-o_SettingsBase_SettingsInstitutionalRecord                      = {"container": o_Gui_MainView,                                                                                                                             "objectName": "_SettingsBase",                                                      "type": "SettingsInstitutionalRecord",                                                       }
-o_SettingsInstitutionalRecord_ListView                          = {"container": o_SettingsBase_SettingsInstitutionalRecord,                              "id": "_listView",                                                                                                                                     "type": "ListView",                                                   "unnamed": 1           }
-o_SettingsInstitutionalRecord_BackButton                        = {"container": o_SettingsBase_SettingsInstitutionalRecord,                                                                                                 "objectName": "_backButton",                                                        "type": "BackButton",                                                                        }
-o_SettingsInstitutionalRecord_NotificationBar                   = {"container": o_SettingsBase_SettingsInstitutionalRecord,                                                                                                 "objectName": "NotificationBar",                                                    "type": "NotificationBarSmall",                                                              }
-o_SettingsInstitutional_min_ValueAdjuster                       = {"container": o_SettingsBase_SettingsInstitutionalRecord,                              "id": "_min",                                                                                                                                          "type": "ValueAdjuster",                                              "unnamed": 1           }
-o_SettingsInstitutional_max_ValueAdjuster                       = {"container": o_SettingsBase_SettingsInstitutionalRecord,                              "id": "_max",                                                                                                                                          "type": "ValueAdjuster",                                              "unnamed": 1           }
-o_SettingsInstitutional_def_ValueAdjuster                       = {"container": o_SettingsBase_SettingsInstitutionalRecord,                              "id": "_def",                                                                                                                                          "type": "ValueAdjuster",                                              "unnamed": 1           }
-o_SettingsInstitutional_ConfirmButton                           = {"container": o_SettingsBase_SettingsInstitutionalRecord,                                                                                                 "objectName": "_confirmButton",                                                     "type": "ConfirmButton",                                                                     }
-o_SettingsBase_SettingsAdvancedInstitutional                    = {"container": o_Gui_MainView,                                                                                                                             "objectName": "_SettingsBase",                                                      "type": "SettingsAdvancedInstitutional",                                                     }
-o_SettingsAdvancedInstitutional_Notification                    = {"container": o_SettingsBase_SettingsAdvancedInstitutional,                                                                                               "objectName": "NotificationBar",                                                    "type": "NotificationBarSmall",                                                              }
-o_SettingsAdvancedInstitutional_ConfirmButton                   = {"container": o_SettingsBase_SettingsAdvancedInstitutional,                                                                                               "objectName": "_confirmButton",                                                     "type": "ConfirmButton",                                                                     }
-o_SettingsAdvancedInstitutional_BackButton                      = {"container": o_SettingsBase_SettingsAdvancedInstitutional,                                                                                               "objectName": "_backButton",                                                        "type": "BackButton",                                                                        }
-o_SettingsAdvancedInstitutional_min_ValueAdjuster               = {"container": o_SettingsBase_SettingsAdvancedInstitutional,                            "id": "_min",                                                                                                                                          "type": "ValueAdjuster",                                              "unnamed": 1           }
-o_SettingsAdvancedInstitutional_max_ValueAdjuster               = {"container": o_SettingsBase_SettingsAdvancedInstitutional,                            "id": "_max",                                                                                                                                          "type": "ValueAdjuster",                                              "unnamed": 1           }
-o_SettingsAdvancedInstitutional_def_ValueAdjuster               = {"container": o_SettingsBase_SettingsAdvancedInstitutional,                            "id": "_def",                                                                                                                                          "type": "ValueAdjuster",                                              "unnamed": 1           }
-o_PreTreatmentCreate_rightArrow_IconButton                      = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,               "id": "_rightArrow",                                                                                                                                   "type": "IconButton",                                                 "unnamed": 1           }
-o_PreTreatmentSampleStack_PreTreatmentWaterSample               = {"container": o_preTreatmentStack_PreTreatmentStack,                                                                                                      "objectName": "_PreTreatmentSampleStack",                                           "type": "PreTreatmentWaterSample",                                                           }
-o_PreTreatmentSampleStack_button_TouchRect                      = {"container": o_PreTreatmentSampleStack_PreTreatmentWaterSample,                       "id": "_button",                                                                                                                                       "type": "TouchRect",                                                  "unnamed": 1           }
-o_preTreatmentStack_repeater_Repeater                           = {"container": o_preTreatmentStack_PreTreatmentStack,                                   "id": "repeater",                                                                                                                                      "type": "Repeater",                                                   "unnamed": 1           }
-o_PreTreatmentCreate_leftArrow_IconButton                       = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,               "id": "_leftArrow",                                                                                                                                    "type": "IconButton",                                                 "unnamed": 1           }
-
-#Recirculate
-o_recirculateRecirculateStack_EndTreatmentRecirculateStack      = {"container": treatmentStack,                                                                                                                            "objectName": "_recirculateRecirculateStack",                                        "type": "EndTreatmentRecirculateStack",                                                     }
-o_recirculateRecirculateStack_EndTreatmentBase_EndTreatmentBase = {"container": o_recirculateRecirculateStack_EndTreatmentRecirculateStack,                                                                                "objectName": "_EndTreatmentBase",                                                   "type": "EndTreatmentBase",                                                                 }
-o_EndTreatmentBase_NotificationBar_NotificationBarSmall         = {"container": o_recirculateRecirculateStack_EndTreatmentBase_EndTreatmentBase,                                                                           "objectName": "NotificationBar",                                                     "type": "NotificationBarSmall",                                                             }
-o_recirculateRecirculateStack_EndTreatmentBase_EndTreatmentRecirculateProgress= {"container": o_recirculateRecirculateStack_EndTreatmentRecirculateStack,                                                                  "objectName": "_EndTreatmentBase",                                                   "type": "EndTreatmentRecirculateProgress",                                                  }
-o_Recirculate_InProgress_Screen_NotificationBar                 = {"container": o_recirculateRecirculateStack_EndTreatmentBase_EndTreatmentRecirculateProgress,                                                            "objectName": "NotificationBar",                                                     "type": "NotificationBarSmall",                                                             }
-o_EndTreatmentBase_ButtonEndTreatment                           = {"container": o_recirculateRecirculateStack_EndTreatmentBase_EndTreatmentBase,                                                                                                                                                                "type": "ButtonEndTreatment",                                        "unnamed": 1           }
-o_EndTreatmentBase_ButtonStartRecirculate                       = {"container": o_recirculateRecirculateStack_EndTreatmentBase_EndTreatmentBase,                                                                                                                                                                "type": "ButtonStartRecirculate",                                    "unnamed": 1           }
-o_EndTreatmentBase_label_Text                                   = {"container": o_recirculateRecirculateStack_EndTreatmentBase_EndTreatmentRecirculateProgress,                                                            "objectName": "_label",                                                              "type": "Text",                                                                             }
-o_EndTreatmentBase_TimeText_minute_Text                         = {"container": o_recirculateRecirculateStack_EndTreatmentBase_EndTreatmentRecirculateProgress,                                                            "objectName": "_TimeText_minute",                                                    "type": "Text",                                                                             }
-o_EndTreatmentBase_TimeText_second_Text                         = {"container": o_recirculateRecirculateStack_EndTreatmentBase_EndTreatmentRecirculateProgress,                                                            "objectName": "_TimeText_second",                                                    "type": "Text",                                                                             }
-o_Recirculate_InProgress_Screen_ButtonEndTreatment              = {"container": o_recirculateRecirculateStack_EndTreatmentBase_EndTreatmentRecirculateProgress,                                                                                                                                                 "type": "ButtonEndTreatment",                                        "unnamed": 1           }
-o_EndTreatmentBase_ButtonResume                                 = {"container": o_recirculateRecirculateStack_EndTreatmentBase_EndTreatmentRecirculateProgress,                                                                                                                                                 "type": "ButtonResume",                                              "unnamed": 1           }
-o_recirculateRecirculateStack_EndTreatmentBase_EndTreatmentBase_2= {"container": o_recirculateRecirculateStack_EndTreatmentRecirculateStack,                                                                               "objectName": "_EndTreatmentBase",                                                   "type": "EndTreatmentBase",                                          "visible": True        }
-#The 'visible' property is required here to distinguish Reconnect to Patient screen objects from the 'set_up' screen, as both share the same container and object name. This allows Squish to correctly find the object for performing mouseClick() and getting object text.
-o_EndTreatmentBase_ButtonEndTreatment_2                         = {"container": o_recirculateRecirculateStack_EndTreatmentBase_EndTreatmentBase_2,                                                                                                                                                              "type": "ButtonEndTreatment",                                        "unnamed": 1           }
-o_EndTreatmentBase_NotificationBar_NotificationBarSmall_2       = {"container": o_recirculateRecirculateStack_EndTreatmentBase_EndTreatmentBase_2,                                                                         "objectName": "NotificationBar",                                                     "type": "NotificationBarSmall",                                                             }
-o_EndTreatmentBase_ButtonResume_2                               = {"container": o_recirculateRecirculateStack_EndTreatmentBase_EndTreatmentBase_2,                                                                                                                                                              "type": "ButtonResume",                                              "unnamed": 1           }
-
-#General Aesthetics
-o_HeaderBar_SettingsButton                                      = {"container": o_Gui_MainView,                                                          "id": "_settingsButton",                                                                                                                               "type": "IconButton",                                                "unnamed": 1           }
-o_HeaderBar_Settings_iconImage                                  = {"container": o_Gui_MainView,                                                          "id": "_iconImage",                                              "source": "qrc:/images/iSettings",                                                    "type": "Image",                                                     "unnamed": 1           }
-o_HeaderBar_Settings_Popup                                      = {"container": o_Overlay,                                                               "id": "_backgroundRect",                                                                                                                               "type": "Rectangle",                                                 "unnamed": 1           }
-o_Settings_Popup_BrightnessImage                                = {"container": o_Overlay,                                                               "id": "_image",                                                  "source": "qrc:/images/iBrightness",                                                  "type": "Image",                                                     "unnamed": 1           }
-o_Settings_Popup_VolumeImage                                    = {"container": o_Overlay,                                                               "id": "_image",                                                  "source": "qrc:/images/iVolume",                                                      "type": "Image",                                                     "unnamed": 1           }
-o_HeaderBar_Diagnostics_Popup                                   = {"container": o_Overlay,                                                               "id": "_backgroundRect",                                                                                                                               "type": "Rectangle",                                                 "unnamed": 1           }
-o_view_SwipeView                                                = {"container": o_Overlay,                                                               "id": "_view",                                                                                                                                         "type": "SwipeView",                                                 "unnamed": 1           }
-o_HeaderBar_Diagnostics_Popup_TDOpModeColumn                    = {"container": o_view_SwipeView,                                                        "id": "_TDOpModeColumn",                                                                                                                               "type": "DebugDataColumn",                                           "unnamed": 1           }
-o_HeaderBar_Diagnostics_Popup_TDOpmodeData_Value                = {"container": o_view_SwipeView,                                                                                                                          "objectName": "_TDOpmodeData0",                                                      "type": "Text",                                                                             }
-o_HeaderBar_Diagnostics_Popup_TDOpmode_Text                     = {"container": o_view_SwipeView,                                                                                                                          "objectName": "_TDOpmodeDataL0",                                                     "type": "Text",                                                                             }
-o_HeaderBar_Diagnostics_Popup_TDOpmode_Submode_Value            = {"container": o_view_SwipeView,                                                                                                                          "objectName": "_TDOpmodeData1",                                                      "type": "Text",                                                                             }
-o_HeaderBar_Diagnostics_Popup_TDOpmode_Submode_Text             = {"container": o_view_SwipeView,                                                                                                                          "objectName": "_TDOpmodeDataL1",                                                     "type": "Text",                                                                             }
-o_HeaderBar_Diagnostics_Popup_TDTXStatesColumn                  = {"container": o_view_SwipeView,                                                        "id": "_TDTXStatesColumn",                                                                                                                             "type": "DebugDataColumn",                                           "unnamed": 1           }
-
-#Pre Treatment Foundation
-o_pretreatmentInstallation_PreTreatmentBase_PreTreatmentBase_2  = {"container": o_preTreatmentStack_pretreatmentInstallation_PreTreatmentInstallStack,                                                                      "objectName": "_PreTreatmentBase",                                                  "type": "PreTreatmentBase",                                           "visible": True        }
-#The 'visible' property is required here and This allows Squish to correctly find the object for performing mouseClick()
-o_PreTreatmentBase_contentColumn_Column                         = {"container": o_pretreatmentInstallation_PreTreatmentBase_PreTreatmentBase_2,         "id": "_contentColumn",                                                                                                                                 "type": "Column",                                                     "unnamed": 1           }
-o_preTreatmentStack_PreTreatmentBase_PreTreatmentBase_2         = {"container": o_preTreatmentStack_PreTreatmentStack,                                                                                                      "objectName": "_PreTreatmentBase",                                                  "type": "PreTreatmentBase",                                           "visible": True        }
-#The 'visible' property is required here and This allows Squish to correctly find the object for performing mouseClick()
-o_PreTreatmentBase_contentColumn_Column_2                       = {"container": o_preTreatmentStack_PreTreatmentBase_PreTreatmentBase_2,                "id": "_contentColumn",                                                                                                                                 "type": "Column",                                                     "unnamed": 1           }
-o_PreTreatmentBase_autoStepController_AutoStepController        = {"container": o_preTreatmentStack_PreTreatmentBase_PreTreatmentBase,                  "id": "_autoStepController",                                                                                                                            "type": "AutoStepController",                                         "unnamed": 1           }
-
-# Blood Prime
-o_TreatmentBloodPrime_TreatmentBloodPrime                       = {"container": treatmentStack,                                                                                                                            "objectName": "_TreatmentBloodPrime",                                                "type": "TreatmentBloodPrime",                                                              }
-o_TreatmentBloodPrime_arterialRangeBar                          = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime,                               "id": "_arterialRangeBar",                                                                                                                             "type": "TreatmentPressureComponent",                                "unnamed": 1           }
-o_TreatmentBloodPrime_venousRangeBar                            = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime,                               "id": "_venousRangeBar",                                                                                                                               "type": "TreatmentPressureComponent",                                "unnamed": 1           }
-o_TreatmentBloodPrime_tmpRangeBar                               = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime,                               "id": "_tmpRangeBar",                                                                                                                                  "type": "TreatmentPressureComponent",                                "unnamed": 1           }
-o_TreatmentBloodPrime_salineDescriptionText                     = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime,                                                                                                 "objectName": "salineDescriptionText",                                               "type": "Text",                                                                             }
-o_TreatmentBloodPrime_startFluidButton_TouchRect                = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime,                               "id": "_startFluidButton",                                                                                                                             "type": "TouchRect",                                                 "unnamed": 1           }
-o_TreatmentBloodPrime_fluidProgressBar_ProgressBar              = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime,                               "id": "_fluidProgressBar",                                                                                                                             "type": "ProgressBar",                                               "unnamed": 1           }
-o_TreatmentBloodPrime_treatmentSaline                           = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime,                                                                                                 "objectName": "_treatmentSaline",                                                    "type": "TreatmentSaline",                                                                  }
-o_TreatmentBloodPrime_currentBolusVolume                        = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime,                                                                                                                                                                                      "type": "Label",                                                     "unnamed": 1           }
-o_TreatmentBloodPrime_volumeText_Text                           = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime,                                                                                                 "objectName": "_volumeText",                                                         "type": "Text",                                                                             }
-o_TreatmentBloodPrime_Blood_Prime_Paused_Text                   = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime,                                                                                                                                                                                      "type": "Text",                                                      "unnamed": 1           }
-o_TreatmentBloodPrime_volumeProgress_ProgressCircle             = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime,                                                                                                 "objectName": "_volumeProgress",                                                     "type": "ProgressCircle",                                                                   }
-o_TreatmentBloodPrime_pausedNotification                        = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime,                                                                                                 "objectName": "_pausedNotification",                                                 "type": "NotificationBarSmall",                                                             }
-o_TreatmentBloodPrime_TimeText_hour_Text                        = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime,                                                                                                 "objectName": "_TimeText_hour",                                                      "type": "Text",                                                                             }
-o_TreatmentBloodPrime_TimeText_minute_Text                      = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime,                                                                                                 "objectName": "_TimeText_minute",                                                    "type": "Text",                                                                             }
-o_TreatmentBloodPrime_flowRateValue_Text                        = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime,                                                                                                 "objectName": "_flowRateValue",                                                      "type": "Text",                                                                             }
-o_TreatmentBloodPrime_flowRateUnit_Text                         = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime,                                                                                                 "objectName": "_flowRateUnit",                                                       "type": "Text",                                                                             }
-o_TreatmentBloodPrime_decrementFlowRateButton_ArrowButton       = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime,                                                                                                 "objectName": "_decrementFlowRateButton",                                            "type": "ArrowButton",                                                                      }
-o_TreatmentBloodPrime_incrementFlowRateButton_ArrowButton       = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime,                                                                                                 "objectName": "_incrementFlowRateButton",                                            "type": "ArrowButton",                                                                      }
-o_TreatmentBloodPrime_pauseResumeButton_TouchRect               = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime,                                                                                                 "objectName": "_pauseResumeButton",                                                  "type": "TouchRect",                                                                        }
-o_TreatmentBloodPrime_NotificationBar                           = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime,                                                                                                 "objectName": "NotificationBar",                                                     "type": "NotificationBarSmall",                                                             }
-
-
-#Isolated UF
-o_isolatedUfButton_TouchRect                                    = {"container": o_Overlay,                                                                                                                                  "objectName": "_isolatedUfButton",                                                  "type": "TouchRect"                                                                        }
-o_valueAdjuster_ValueAdjuster                                   = {"container": o_Overlay,                                                                                                                                  "objectName": "_valueAdjuster",                                                     "type": "ValueAdjuster"                                                                    }
-o_volumeProgress_ProgressBarEx                                  = {"container": o_Overlay,                                                                                                                                  "objectName": "_volumeProgress",                                                    "type": "ProgressBarEx"                                                                    }
-o_volumeAdjuster_LabelUnitValueAdjuster                         = {"container": o_Overlay,                                                                                                                                  "objectName": "_volumeAdjuster",                                                    "type": "LabelUnitValueAdjuster"                                                           }
-o_PreTreatmentCreate_volumeAdjuster_slider_Slider               = {"container": o_volumeAdjuster_LabelUnitValueAdjuster,                                "id": "_slider",                                                                                                                                        "type": "Slider",                                                   "unnamed": 1           }
-o_valueAdjuster_ValueAdjuster_2                                 = {"container": o_volumeAdjuster_LabelUnitValueAdjuster,                                                                                                    "objectName": "_valueAdjuster",                                                     "type": "ValueAdjuster"                                                                    }
-o_volumeGoal_LabelUnitText                                      = {"container": o_Overlay,                                                                                                                                  "objectName": "_volumeGoal",                                                        "type": "LabelUnitText"                                                                    }
-o_duration_LabelUnitText                                        = {"container": o_Overlay,                                                                                                                                  "objectName": "_duration",                                                          "type": "LabelUnitText"                                                                    }
-o_rate_LabelUnitText                                            = {"container": o_Overlay,                                                                                                                                  "objectName": "_rate",                                                              "type": "LabelUnitText"                                                                    }
-o_treatmentAdjustmentIsolatedUFDurationEdit                     = {"container": o_Overlay,                                                                                                                                  "objectName": "_treatmentAdjustmentIsolatedUFDurationEdit",                         "type": "TreatmentAdjustmentIsolatedUFDurationEdit"                                        }
-o_treatmentAdjustmentIsolatedUFVolumeEdit                       = {"container": o_Overlay,                                                                                                                                  "objectName": "_treatmentAdjustmentIsolatedUFVolumeEdit",                           "type": "TreatmentAdjustmentIsolatedUFVolumeEdit"                                          }
-
-
-#patient vitals
-o_treatmentVitals                                               = {"container": mainTreatmentScreen,                                                                                           "objectName": "treatmentVitals",                                                                                 "type": "TreatmentVitals"                                                                   }                  
-o_treatmentHome_editButton_IconButton                           = {"container": o_treatmentVitals,                                                      "id": "_editButton",                                                                                                                                    "type": "IconButton",                                               "unnamed": 1            }
-o_vitalsButton_VitalsButton                                     = {"container": o_Gui_MainView,                                                  "id": "_vitalsButton",                                                                 "type": "VitalsButton",                         "unnamed": 1                                                }
-o_bloodPressureSystolic_TextEntry                               = {"container": o_Overlay,                                                       "id": "_bloodPressureSystolic",                                                        "type": "TextEntry",                            "unnamed": 1                                                }
-o_bloodPressureDiastolic_TextEntry                              = {"container": o_Overlay,                                                       "id": "_bloodPressureDiastolic",                                                       "type": "TextEntry",                            "unnamed": 1                                                }
-o_title_Text                                                    = {"container": o_Overlay,                                                                                                                                              "type": "Text",                                 "unnamed": 1                                                }
-o_heartRate_TextEntry                                           = {"container": o_Overlay,                                                       "id": "_heartRate",                                                                    "type": "TextEntry",                            "unnamed": 1                                                }
-o_confirm_button                                                = {"container": o_Overlay,                                                       "id": "_confirmButton",                                                                "type": "ConfirmButton",                        "unnamed": 1                                                }
-o_treatmentHome_bloodPressure_LabelValue                        = {"container": mainTreatmentScreen,                                             "id": "_bloodPressure",                                                                "type": "LabelValue",                           "unnamed": 1                                                }
-o_vitals_Interval_TitleText                                     = {"container": o_Overlay,                                                                                                                                              "type": "TitleText",                            "unnamed": 1                                                }
-o_vitals_Interval_BaseComboBox                                  = {"container": o_Overlay,                                                       "id": "_bpMeasurementIntervalControl",                                                 "type": "BaseComboBox",                         "unnamed": 1                                                }
-o_treatmentHome_heartBeat_LabelValue                            = {"container": mainTreatmentScreen,                                             "id": "_heartBeat",                                                                    "type": "LabelValue",                           "unnamed": 1                                                }
-o_vitals_close_btn                                              = {"container": o_Overlay,                                                       "id": "_image",                                 "source": "qrc:/images/iClose",        "type": "Image",                                "unnamed": 1                                                }
-o_back_space_key                                                = {"container": o_Overlay, "source": "qrc:/images/iBackspace",                                                                                                          "type": "Image",                                "unnamed": 1                                                }   
-o_vitalCountdown_Text                                           = {"container": o_Gui_MainView,                                                                                                 "objectName": "_vitalCountdown",        "type": "Text"                                                                                              }
-o_vitals_reading                                                = {"container": mainTreatmentScreen,                                                                                                                                    "type": "Text",                                 "unnamed": 1                                                }
-keyboard_input                                                  = {"container": o_Overlay,                                                                                                                                              "type": "Text",                                 "unnamed": 1                                                }                                      
-o_last_read                                                     = {"container": mainTreatmentScreen,                                            "id":"_lastRecorded" ,                                                                  "type": "Text",                                 "unnamed": 1                                                }
-o_measureVitalsButton_TouchRect                                 = {"container": o_Overlay,                                                      "id": "_measureVitalsButton",                                                           "type": "TouchRect",                            "unnamed": 1                                                }
-o_bpMeasurementIntervalControl_ValueAdjusterCustom              = {"container": o_Overlay,                                                       "id": "_bpMeasurementIntervalControl",                                                 "type": "ValueAdjusterCustom",                  "unnamed": 1                                                }
-o_notification_bar                                              = {"container": o_Overlay,                                                                                                      "objectName": "NotificationBar",        "type": "NotificationBarSmall"                                                                              }
-o_SettingsBase_SettingsFeatureConfigurations                    = {"container": o_Gui_MainView,                                                                                                 "objectName": "_SettingsBase",          "type": "SettingsFeatureConfigurations",                                                                    }
-o_SettingsBase_integratedBPCuffSwitch_BaseSwitch                = {"checkable": True, "container": o_SettingsBase_SettingsFeatureConfigurations,         "id": "_integratedBPCuffSwitch",                                               "type": "BaseSwitch",                           "unnamed": 1                                                }
-o_headerBar_HeaderBar                                           = {"container": o_Gui_MainView,                                                          "id": "_headerBar",                                                            "type": "HeaderBar",                            "unnamed": 1                                                }
-o_SettingsStack_SettingsStack                                   = {"container": o_Gui_MainView,                                                                                                 "objectName": "_SettingsStack",         "type": "SettingsStack",                                                                                    }
-o_UserConfirmation_SettingsServicePassword                      = {"container": o_SettingsStack_SettingsStack,                                                                                  "objectName": "UserConfirmation",       "type": "SettingsServicePassword",                                                                          }
-o_userConfirmation_TextInput                                    = {"container": o_UserConfirmation_SettingsServicePassword,               "echoMode": 2, "id": "_input", "passwordCharacter": "•",                                      "type": "TextInput",                            "unnamed": 1,                                               }
-o_userConfirmation_ConfirmButton                                = {"container": o_UserConfirmation_SettingsServicePassword,                                                                     "objectName": "_confirmButton",         "type": "ConfirmButton",                                                                                    }
-o_numRect_Rectangle                                             = {"container": o_Overlay,                                                               "id": "_numRect",                                                                                                                                      "type": "Rectangle",                                                 "unnamed": 1           }
-o_Vitals_Popup_CloseButton                                      = {"container": o_Overlay,                                                               "id": "_closeButton",                                                                                                                                  "type": "CloseButton",                                               "unnamed": 1           }
-
-
-#New design create Rx
-o_preTreatmentStack_PreTreatmentStack                           = {"container": o_Gui_MainView,                                                          "id": "_preTreatmentStack",                                                                                                                            "type": "PreTreatmentStack",                                         "unnamed": 1           }
-o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate       = {"container": o_preTreatmentStack_PreTreatmentStack,                                                                                                     "objectName": "_PreTreatmentCreate",                                                 "type": "PreTreatmentCreate"                                                                }
-o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry       = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,               "id": "_pretreatmentPatientIDEntry",                                                                                                                   "type": "TextEntry",                                                 "unnamed": 1           }
+o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom= {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,          "id": "_bpMeasurementIntervalControl",                                                                                                                 "type": "ValueAdjusterCustom",                                       "unnamed": 1           }
+          
+o_preTreatmentStack_confirmButton_ConfirmButton                 = {"container": o_preTreatmentStack_PreTreatmentStack,                                                                                                   "objectName": "_confirmButton",                                                        "type": "ConfirmButton",                                             "visible": True        }
+o_waterSample_IconButton                                        = {"container": o_Gui_MainView,                                                          "id": "_waterSample",                                                                                                                                  "type": "IconButton",                                                "unnamed": 1           }
+o_menu_MainMenu                                                 = {"container": o_Overlay,                                                               "id": "_menu",                                                                                                                                         "type": "MainMenu",                                                  "unnamed": 1           }
+o_Column                                                        = {"container": o_Overlay,                                                                                                                                                                                                                      "type": "Column",                                                    "unnamed": 1           }
+o_confirmButton_ConfirmButton_2                                 = {"container": o_Overlay,                                                                                                                              "objectName": "_confirmButton",                                                         "type": "ConfirmButton"                                                                     }
+o_touchRect1_TouchRect                                          = {"container": o_Overlay,                                                                                                                              "objectName": "_touchRect1",                                                            "type": "TouchRect"                                                                         }
+o_acidConcentrateContainer_LabelUnitContainer                   = {"container": o_Overlay,                                                                                                                              "objectName": "_acidConcentrateContainer",                                              "type": "LabelUnitContainer"                                                                }
+o_bicarbonateCartrideSizeContainer_LabelUnitContainer           = {"container": o_Overlay,                                                                                                                              "objectName": "_bicarbonateCartrideSizeContainer",                                      "type": "LabelUnitContainer"                                                                }
+o_sodiumContainer_LabelUnitContainer                            = {"container": o_Overlay,                                                                                                                              "objectName": "_sodiumContainer",                                                       "type": "LabelUnitContainer"                                                                }
+o_bicarbonateContainer_LabelUnitContainer                       = {"container": o_Overlay,                                                                                                                              "objectName": "_bicarbonateContainer",                                                  "type": "LabelUnitContainer"                                                                }
+o_theoriticalCondictivityContainer_LabelUnitContainer           = {"container": o_Overlay,                                                                                                                              "objectName": "_theoriticalCondictivityContainer",                                      "type": "LabelUnitContainer"                                                                }
+o_independentConductivityReadingContainer1_LabelUnitContainer   = {"container": o_Overlay,                                                                                                                              "objectName": "_independentConductivityReadingContainer1",                              "type": "LabelUnitContainer"                                                                }
+o_independentConductivityReadingContainer2_LabelUnitContainer   = {"container": o_Overlay,                                                                                                                              "objectName": "_independentConductivityReadingContainer2",                              "type": "LabelUnitContainer"                                                                }
+o_dialsateTemperatureContainer_LabelUnitContainer               = {"container": o_Overlay,                                                                                                                              "objectName": "_dialsateTemperatureContainer",                                          "type": "LabelUnitContainer"                                                                }
+o_actualRORejectionPercentageContainer_LabelUnitContainer       = {"container": o_Overlay,                                                                                                                              "objectName": "_actualRORejectionPercentageContainer",                                  "type": "LabelUnitContainer"                                                                }
 o_createHDTreatment_TouchRect                                   = {"container": o_standByScreen_MainHome,                                               "id": "_createHDTreatment",                                                                                                                             "type": "TouchRect",                                                  "unnamed": 1           }
-o_PreTreatmentCreate_leftColumn_Column                          = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_leftColumn",                                                                                                                                    "type": "Column",                                                     "unnamed": 1           }
-o_PreTreatmentCreate_rightColumn_Column                         = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_rightColumn",                                                                                                                                   "type": "Column",                                                     "unnamed": 1           }
-o_LabelUnitValueAdjuster_LabelUnitValueAdjuster                 = {"container": o_Overlay, "objectName": "_LabelUnitValueAdjuster",                                                                                                                                                                             "type": "LabelUnitValueAdjuster"                                                             }
-o_heparinDispensingRate_LabelUnitValueAdjuster                  = {"container": o_Overlay, "objectName": "_LabelUnitValueAdjuster",                     "id": "_heparinDispensingRate",                                                                                                                         "type": "LabelUnitValueAdjuster"                                                             }
-o_heparinDeliveryDuration_LabelUnitValueAdjuster                = {"container": o_Overlay, "objectName": "_LabelUnitValueAdjuster",                     "id": "_heparinDeliveryDuration",                                                                                                                       "type": "LabelUnitValueAdjuster"                                                             }
-o_PreTreatmentCreate_leftColumn_Column_2                        = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_leftColumn",                                                                                                                                    "type": "Column",                                                     "unnamed": 1           }
-o_PreTreatmentCreate_rightColumn_Column_2                       = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_rightColumn",                                                                                                                                   "type": "Column",                                                     "unnamed": 1           }
-o_PreTreatmentCreate_sodium_LabelUnitValueAdjuster              = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_sodium",                                                    "objectName": "_LabelUnitValueAdjuster",                                            "type": "LabelUnitValueAdjuster"                                                             }
-o_PreTreatmentCreate_bicarbonate_LabelUnitValueAdjuster         = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_bicarbonate",                                               "objectName": "_LabelUnitValueAdjuster",                                            "type": "LabelUnitValueAdjuster"                                                             }
-o_PreTreatmentCreate_fluidBolusVolume_LabelUnitValueAdjuster    = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_fluidBolusVolume",                                          "objectName": "_LabelUnitValueAdjuster",                                            "type": "LabelUnitValueAdjuster"                                                             }
-o_PreTreatmentCreate_primeRinsebackVolume_LabelUnitValueAdjuster= {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_primeRinsebackVolume",                                      "objectName": "_LabelUnitValueAdjuster",                                            "type": "LabelUnitValueAdjuster"                                                             }
-o_PreTreatmentCreate_listView_ListView                          = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_listView",                                                                                                                                      "type": "ListView",                                                   "unnamed": 1           }
-o_createHDFTreatment_TouchRect                                  = {"container": o_standByScreen_MainHome,                                               "id": "_createHDFTreatment",                                                                                                                            "type": "TouchRect",                                                  "unnamed": 1           }
-o_PreTreatmentCreate_hdfTreatmentMode_LabelUnitContainer        = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_hdfTreatmentMode",                                                                                                                              "type": "LabelUnitContainer",                                         "unnamed": 1           }
-o_PreTreatmentCreate_acidConcentrateComboBox_BaseComboBox       = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_acidConcentrateComboBox",                                                                                                                       "type": "BaseComboBox",                                               "unnamed": 1           }
-o_PreTreatmentCreate_dialyzerTypeComboBox_BaseComboBox          = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_dialyzerTypeComboBox",                                                                                                                          "type": "BaseComboBox",                                               "unnamed": 1           }
-o_PreTreatmentCreate_bicarbonateConcentrateComboBox_BaseComboBox= {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_bicarbonateConcentrateComboBox",                                                                                                                "type": "BaseComboBox",                                               "unnamed": 1           }
-o_PreTreatmentCreate_treatmentModalityComboBox_BaseComboBox     = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_treatmentModalityComboBox",                                                                                                                     "type": "BaseComboBox",                                               "unnamed": 1           }
-o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bpMeasurementIntervalControl", "type": "ValueAdjusterCustom", "unnamed": 1}
-
-# Edit Treatment Parameters
-o_treatmentHome_treatmentPressures_TreatmentPressures                   = {"container": mainTreatmentScreen,                                                                                                             "objectName": "treatmentPressures",                                                    "type": "TreatmentPressures"                                                                }
-o_valueAdjuster_ValueAdjuster                                           = {"container": o_Overlay,                                                                                                                       "objectName": "_valueAdjuster",                                                        "type": "ValueAdjuster",                                                                    }
-o_treatmentHome_treatmentFlows_TreatmentFlows                           = {"container": mainTreatmentScreen,                                                                                                             "objectName": "treatmentFlows",                                                        "type": "TreatmentFlows"                                                                    }
-o_dialysateFlowRate_LabelUnitValueAdjuster                              = {"container": o_Overlay,                                                                                                                       "objectName": "_dialysateFlowRate",                                                    "type": "LabelUnitValueAdjuster"                                                            }
-o_bloodFlowRate_LabelUnitValueAdjuster                                  = {"container": o_Overlay,                                                                                                                       "objectName": "_bloodFlowRate",                                                        "type": "LabelUnitValueAdjuster"                                                            }
-o_dialysateTemperature_LabelUnitValueAdjuster                           = {"container": o_Overlay,                                                                                                                       "objectName": "_dialysateTemperature",                                                 "type": "LabelUnitValueAdjuster"                                                            }
-o_treatmentHome_notification_NotificationBarSmall                       = {"container": mainTreatmentScreen,                                                                                                             "objectName": "_notification",                                                         "type": "NotificationBarSmall"                                                              }
-o_ufVolumeRemoved_LabelUnitText                                         = {"container": o_Overlay,                                                                                                                       "objectName": "_ufVolumeRemoved",                                                      "type": "LabelUnitText"                                                                     }
-o_ufVolumeGoal_LabelUnitText                                            = {"container": o_Overlay,                                                                                                                       "objectName": "_ufVolumeGoal",                                                         "type": "LabelUnitText"                                                                     }
-o_timeElapsed_LabelUnitText                                             = {"container": o_Overlay,                                                                                                                       "objectName": "_timeElapsed",                                                          "type": "LabelUnitText"                                                                     }
-o_newTreatmentDuration_LabelUnitValueAdjuster                           = {"container": o_Overlay,                                                                                                                       "objectName": "_newTreatmentDuration",                                                 "type": "LabelUnitValueAdjuster"                                                            }
-o_ufRate_LabelUnitText                                                  = {"container": o_Overlay,                                                                                                                       "objectName": "_ufRate",                                                               "type": "LabelUnitText"                                                                     }
-o_newTreatmentDuration_LabelUnitText                                    = {"container": o_Overlay,                                                                                                                       "objectName": "_newTreatmentDuration",                                                 "type": "LabelUnitText"                                                                     }
-
-#Rinseback
-o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack         = {"container": o_Gui_MainView,                                                                                                                            "objectName": "_EndTreatmentRinsebackStack",                                         "type": "EndTreatmentRinsebackStack",                                                       }
-o_EndTreatmentRinsebackStack_EndTreatmentRinseback              = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack,                                                                                   "objectName": "_EndTreatmentRinseback",                                              "type": "EndTreatmentRinseback",                                                            }
-o_EndTreatmentRinseback_arterialRangeBar_TreatmentPressureComponent= {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback,                   "id": "_arterialRangeBar",                                                                                                                             "type": "TreatmentPressureComponent",                                "unnamed": 1           }
-o_EndTreatmentRinseback_venousRangeBar_TreatmentPressureComponent= {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback,                     "id": "_venousRangeBar",                                                                                                                               "type": "TreatmentPressureComponent",                                "unnamed": 1           }
-o_EndTreatmentRinseback_tmpRangeBar_TreatmentPressureComponent  = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback,                      "id": "_tmpRangeBar",                                                                                                                                  "type": "TreatmentPressureComponent",                                "unnamed": 1           }
-o_EndTreatmentRinseback_deliveredVolumeText_Text                = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback,                                                                                        "objectName": "_deliveredVolumeText",                                                "type": "Text",                                                                             }
-o_EndTreatmentRinseback_flowRateValue_Text                      = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback,                                                                                        "objectName": "_flowRateValue",                                                      "type": "Text",                                                                             }
-o_EndTreatmentRinseback_endButton_TouchRect                     = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback,                                                                                        "objectName": "_endButton",                                                          "type": "TouchRect",                                                                        }
-o_EndTreatmentRinseback_pauseResumeButton_TouchRect             = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback,                                                                                        "objectName": "_pauseResumeButton",                                                  "type": "TouchRect",                                                                        }
-o_EndTreatmentRinseback_NotificationBar_NotificationBarSmall    = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback,                                                                                        "objectName": "NotificationBar",                                                     "type": "NotificationBarSmall",                                                             }
-o_EndTreatmentRinseback                                         = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback,                                                                                                                                                                             "type": "Text",                                                      "unnamed": 1           }
-o_EndTreatmentRinseback_targetVolumeProgress_ProgressCircle     = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback,                                                                                        "objectName": "_targetVolumeProgress",                                               "type": "ProgressCircle",                                                                   }
-o_EndTreatmentRinseback_timeout_TimeText                        = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback,                                                                                        "objectName": "_timeout",                                                            "type": "TimeText",                                                                         }
-o_EndTreatmentRinseback_decrementFlowRateButton_ArrowButton     = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback,                                                                                        "objectName": "_decrementFlowRateButton",                                            "type": "ArrowButton",                                                                      }
-o_EndTreatmentRinseback_incrementFlowRateButton_ArrowButton     = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback,                                                                                        "objectName": "_incrementFlowRateButton",                                            "type": "ArrowButton",                                                                      }
-o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete      = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack,                                                                                   "objectName": "_EndTreatmentRinsebackComplete",                                      "type": "EndTreatmentRinsebackComplete",                                                    }
-o_EndTreatmentRinsebackComplete_instructionView_InstructionView = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete,              "id": "_instructionView",                                                                                                                              "type": "InstructionView",                                           "unnamed": 1           }
-o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit          = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack,                                                                                   "objectName": "_EndTreatmentRinsebackInit",                                          "type": "EndTreatmentRinsebackInit",                                                        }
-o_EndTreatmentRinsebackInit_description_Text                    = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit,                                                                                    "objectName": "_description",                                                        "type": "Text",                                                                             }
-o_EndTreatmentRinsebackInit_TimeText_hour_Text                  = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit,                                                                                    "objectName": "_TimeText_hour",                                                      "type": "Text",                                                                             }
-o_EndTreatmentRinsebackInit_TimeText_minute_Text                = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit,                                                                                    "objectName": "_TimeText_minute",                                                    "type": "Text",                                                                             }
-o_EndTreatmentRinsebackInit_NotificationBar_NotificationBarSmall= {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit,                                                                                    "objectName": "NotificationBar",                                                     "type": "NotificationBarSmall",                                                             }
-o_EndTreatmentRinsebackInit_beginRinsebackTouchRect_TouchRect   = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit,                  "id": "_beginRinsebackTouchRect",                                                                                                                      "type": "TouchRect",                                                 "unnamed": 1           }
-o_Blood_Return_Complete_Title_Text                              = {"container": o_Overlay,                                                               "id": "_messageText",                                                                                                                                  "type": "TitleText",                                                 "unnamed": 1           }
-o_Blood_Return_Complete_Recirculate_TouchRect                   = {"container": o_Overlay,                                                               "id": "_additionalTouch",                                                                                                                              "type": "TouchRect",                                                 "unnamed": 1           }
-o_Blood_Return_Complete_End_Treatment_TouchRect                 = {"container": o_Overlay,                                                               "id": "_cancelTouch",                                                                                                                                  "type": "TouchRect",                                                 "unnamed": 1           }
-o_Blood_Return_Complete_Fluid_Bolus_TouchRect                   = {"container": o_Overlay,                                                               "id": "_confirmTouch",                                                                                                                                 "type": "ConfirmButton",                                             "unnamed": 1           }