Index: suite_leahi/shared/scripts/configuration/config.py
===================================================================
diff -u -ra774225d7e3f88892d90e0dda307b8c17b18899c -r525a83f4f0a858c74d9b475e3760f1921ac1052f
--- suite_leahi/shared/scripts/configuration/config.py	(.../config.py)	(revision a774225d7e3f88892d90e0dda307b8c17b18899c)
+++ suite_leahi/shared/scripts/configuration/config.py	(.../config.py)	(revision 525a83f4f0a858c74d9b475e3760f1921ac1052f)
@@ -65,10 +65,10 @@
 ALARM_REJECT_NOTIFICATION_TEMPLATE = "No Active Alarm List [{}]"
 
 #Create Rx
-ACID_CONCENTRATE            = ["1.0 K, 2.50 Ca, 1 Mg","2.0 K, 2.50 Ca, 1 Mg","3.0 K, 2.50 Ca, 1 Mg"]
+ACID_CONCENTRATE            = ["1.0 K, 2.50 Ca","2.0 K, 2.50 Ca","3.0 K, 2.50 Ca"]
 DIALYZER_TYPE               = ["Diacap Pro 13H","Diacap Pro 16H", "Diacap Pro 19H", "Optiflux F160NRe", "Optiflux F180NRe", "Optiflux F200NRe","Optiflux F250NRe"]
 VITALS                      = ["OFF","5","10","15","20","30","60"]
-BICARBONATE                 = ["Sodium Bicarbonate"]
+BICARBONATE                 = ["650 g","720 g","760 g", "900 g", "1100 g","1250 g"]
 
 #Heparin
 heparin_off    = { "Heparin Type"    :"OFF",
Index: suite_leahi/shared/scripts/configuration/utility.py
===================================================================
diff -u -r50d3084c54eef035058b21579538b53f503af657 -r525a83f4f0a858c74d9b475e3760f1921ac1052f
--- suite_leahi/shared/scripts/configuration/utility.py	(.../utility.py)	(revision 50d3084c54eef035058b21579538b53f503af657)
+++ suite_leahi/shared/scripts/configuration/utility.py	(.../utility.py)	(revision 525a83f4f0a858c74d9b475e3760f1921ac1052f)
@@ -10,6 +10,59 @@
 
 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))
+
+
 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
@@ -89,15 +142,15 @@
     target_value = target_value
  
     # Wait for all objects
-    parent_obj = squish.waitForObjectExists(obj)
+    parent_obj = squish.waitForObject(obj)
     # change range as per your screen count
     
     left_arrow = findObjectById(parent_obj, "_leftArrow")
     right_arrow =findObjectById(parent_obj, "_rightArrow")
  
     # Read current value (supports invisible text too)
     
-    current_value = round(float(squish.findObject(obj).value),1)
+    current_value = round(float(squish.waitForObject(obj).value), 1)
     
     # Determine direction
     while current_value != float(target_value):
@@ -107,7 +160,7 @@
         elif current_value > float(target_value):
             squish.mouseClick(squish.waitForObject(left_arrow))
         
-        current_value = round(float(squish.findObject(obj).value),1)
+        current_value = round(float(squish.waitForObject(obj).value), 1)
        
         test.log(f"Updated value: {current_value}")
  
@@ -132,46 +185,63 @@
     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)
-    heparinValue =navigation.get_ini_value("/home/denali/Public/luis/config/configurations/Settings/System.conf", section ="Feature Configurations", key ="HeparinSyringePump")
-    if heparinValue == "1":
-        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)
+    squish.waitForObject(names.o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry).text ="Patient ID"
+    parent_obj             = squish.waitForObject(names.o_PreTreatmentCreate_leftColumn_Column)
+    blood_flow_rate        = findObjectById(parent_obj, "_bloodFlowRate")
+    set_value_based_on_target(blood_flow_rate, 70)
+    dialysate_flow_rate    = findObjectById(parent_obj, "_dialysateFlowRate")
+    set_value_based_on_target(dialysate_flow_rate, 50)
+    duration               = findObjectById(parent_obj,"_duration")
+    set_value_based_on_target(duration, 60)
+    right_obj              = squish.waitForObject(names.o_PreTreatmentCreate_rightColumn_Column)
+    ultrafiltration_volume = findObjectById(right_obj,"_ufVolume")
+    set_value_based_on_target(ultrafiltration_volume,0.20)
+    heparin_rx             = findObjectById(right_obj,"_heparinRx")
+    heparin_right_arrow    = findObjectById(heparin_rx, "_rightArrow")
+    squish.mouseClick(heparin_right_arrow)
+    heparin_obj            = squish.waitForObject(names.o_LabelUnitValueAdjuster_LabelUnitValueAdjuster)
+    heparin_bolus          = findObjectById(heparin_obj,"_heparinBolusVolume")
+    set_value_based_on_target(heparin_bolus, 0.2)
+    set_value_based_on_target(names.o_heparinDispensingRate_LabelUnitValueAdjuster,0.3)
+    set_value_based_on_target(names.o_heparinDeliveryDuration_LabelUnitValueAdjuster, 60)
+    squish.mouseClick(squish.waitForObject(names.o_confirmButton_ConfirmButton))
     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)
-    set_value_based_on_target(names.o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom,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
-                                            )
-    confirm = squish.waitForObjectExists(names.o_preTreatmentStack_confirmButton_ConfirmButton, 3000)
-    squish.mouseClick(confirm)
+    Nextbutton            = setObjectText(obj =names.o_preTreatmentStack_Text, text =config.NEXT)
+    squish.mouseClick(squish.waitForObject(Nextbutton))
+    set_value_based_on_target(names.o_PreTreatmentCreate_sodium_LabelUnitValueAdjuster, 139)
+    set_value_based_on_target(names.o_PreTreatmentCreate_bicarbonate_LabelUnitValueAdjuster, 35)
+    set_value_based_on_target(names.o_PreTreatmentCreate_fluidBolusVolume_LabelUnitValueAdjuster,300)
+    set_value_based_on_target(names.o_PreTreatmentCreate_primeRinsebackVolume_LabelUnitValueAdjuster,310)
+    confirm_button          = squish.waitForObjectExists(names.o_preTreatmentStack_confirmButton_ConfirmButton)
+    squish.mouseClick(confirm_button)
+    td.td_Treatment_Parameters_Validation(  vAccepted                                            = 1,
+                                            vTreatmentModalityRejectReason                       = 1,    
+                                            vHDFTreatmentModeRejectReason                        = 0,     
+                                            vBloodFlowRateRejectReason                           = 0,                  
+                                            vDialysateFlowRateRejectReason                       = 0,     
+                                            vTreatmentDurationRejectReason                       = 0,     
+                                            vHeparinDeliveryDurationRejectReason                 = 0,     
+                                            vHeparinTypeRejectReason                             = 0,     
+                                            vDryBicarbCartSizeRejectReason                       = 0,     
+                                            vSodiumRejectReason                                  = 0,     
+                                            vBicarbonateRejectReason                             = 0,     
+                                            vDialyzerTypeRejectReason                            = 0,     
+                                            vFluidBolusVolumeRejectReason                        = 0,     
+                                            vBloodPressureMeasureIntervalRejecteason             = 0,     
+                                            vRinsebackVolumeRejectReason                         = 0,     
+                                            vHepatitusBStatusRejectReason                        = 0,     
+                                            vAcidConcentrateIndextRejectReason                   = 0,
+                                            vSubstitutionFluidVolumeRejecteason                  = 0,     
+                                            vHeparinBolusVolumeRejectReason                      = 0,     
+                                            vHeparinDispensingRateRejecteason                    = 0,     
+                                            vDialysateTempRejectReason                           = 0,     
+                                            vAcidConcentrateConversionFactorRejectReason         = 0,    
+                                            vUFPreWeightRejectReason                             = 0,
+                                            vUFEstimatedTargetWeightRejectReason                 = 0,
+                                            vUFVolumeRejectReason                                = 0
+                                           )
     test.endSection()
     
 def findAllObjectsById(parent, target_id):
Index: suite_leahi/shared/scripts/names.py
===================================================================
diff -u -ra774225d7e3f88892d90e0dda307b8c17b18899c -r525a83f4f0a858c74d9b475e3760f1921ac1052f
--- suite_leahi/shared/scripts/names.py	(.../names.py)	(revision a774225d7e3f88892d90e0dda307b8c17b18899c)
+++ suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 525a83f4f0a858c74d9b475e3760f1921ac1052f)
@@ -120,68 +120,7 @@
 o_SettingsBase_WifiScreen_ScanButton                            = {"container": o_SettingsBase_SettingsWiFi,                                             "id": "_scanButton",                                                                                                                                    "type": "TouchRect",                                                "unnamed": 1          }
 o_SettingsBase_WifiScreen_BackButton                            = {"container": o_SettingsBase_SettingsWiFi,                                                                                                                "objectName": "_backButton",                                                         "type": "BackButton" ,                                                                    }
                                                                                                                                                                                                                                                         
-#Create Treatment
-o_PreTreatmentCreateStack_PreTreatmentCreateStack               = {"container": o_Gui_MainView,                                                                                             "objectName": "_PreTreatmentCreateStack",                                                       "type": "PreTreatmentCreateStack"                                                                               }
-o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate = {"container": o_PreTreatmentCreateStack_PreTreatmentCreateStack,                                                          "objectName": "_PreTreatmentCreate",                                                            "type": "PreTreatmentCreate"                                                                                    }
-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_bullet_object                                                 = {                                                                                                                                                                                                                         "type": "StepBullet",                               "unnamed": 1                                                }
-o_text_object                                                   = {                                                                                                                                                                                                                         "type": "Text",                                     "unnamed": 1                                                }
-o_PreTreatmentCreate_gridSteps_Grid                             = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_gridSteps",                                                                                                                "type": "Grid",                                     "unnamed": 1                                                }    
-o_PreTreatmentCreate_bloodFlowRate_LabelUnitContainer           = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_bloodFlowRate",                                                                                                            "type": "LabelUnitContainer",                       "unnamed": 1                                                }
-o_PreTreatmentCreate_bloodFlowRateControl_ValueAdjuster         = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,               "id": "_bloodFlowRateControl",                                                                                                     "type": "ValueAdjuster",                            "unnamed": 1                                                }    
-o_PatientIDEntry_TextEntry                                      = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_pretreatmentPatientIDEntry",                                                                                               "type": "TextEntry",                                "unnamed": 1                                                }
-o_PreTreatmentCreate_dialysateFlowRateControl_ValueAdjuster     = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,               "id": "_dialysateFlowRateControl",                                                                                                 "type": "ValueAdjuster",                            "unnamed": 1                                                }
-o_PreTreatmentCreate_durationControl_ValueAdjuster              = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,               "id": "_durationControl",                                                                                                          "type": "ValueAdjuster",                            "unnamed": 1                                                }
-o_PreTreatmentCreate_heparinBolusVolumeControl_ValueAdjuster    = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,               "id": "_heparinBolusVolumeControl",                                                                                                "type": "ValueAdjuster",                            "unnamed": 1                                                }
-o_PreTreatmentCreate_heparinDispensingRateControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,               "id": "_heparinDispensingRateControl",                                                                                             "type": "ValueAdjuster",                            "unnamed": 1                                                }
-o_PreTreatmentCreate_heparinDispensingRate_LabelUnitContainer   = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_heparinDispensingRate",                                                                                                    "type": "LabelUnitContainer",                       "unnamed": 1,                                               }
-o_PreTreatmentCreate_heparinDispensingRateControl_OffText       = {"container": o_PreTreatmentCreate_heparinDispensingRateControl_ValueAdjuster,                                                                                                                                            "type": "Text",                                     "unnamed": 1                                                }
-o_PreTreatmentCreate_heparinStopTimeControl_ValueAdjuster       = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,               "id": "_heparinStopTimeControl",                                                                                                   "type": "ValueAdjuster",                            "unnamed": 1                                                }
-o_PreTreatmentCreate_dialysateTemperatureControl_ValueAdjuster  = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,               "id": "_dialysateTemperatureControl",                                                                                              "type": "ValueAdjuster",                            "unnamed": 1                                                }
-o_PreTreatmentCreate_salineBolusVolumeControl_ValueAdjuster     = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,               "id": "_salineBolusVolumeControl",                                                                                                 "type": "ValueAdjuster",                            "unnamed": 1                                                }
-o_PreTreatmentCreate_heparinBolusVolume_LabelUnitContainer      = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_heparinBolusVolume",                                                                                                       "type": "LabelUnitContainer",                       "unnamed": 1                                                }
-o_PreTreatmentCreate_heparinBolusVolume_Off_Text                = {"container": o_PreTreatmentCreate_heparinBolusVolumeControl_ValueAdjuster,                                                                                                                                               "type": "Text",                                     "unnamed": 1                                                }
-o_PreTreatmentCreate_dialyzerTypeComboBox_BaseComboBox          = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,               "id": "_dialyzerTypeComboBox",                                                                                                     "type": "BaseComboBox",                             "unnamed": 1                                                }
-o_saveButton_TouchRect                                          = {"container": o_Overlay,                                                               "id": "_saveButton",                                                                                                               "type": "TouchRect",                                "unnamed": 1                                                }
-o_PreTreatmentCreate_acidConcentrateComboBox_BaseComboBox       = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,               "id": "_acidConcentrateComboBox",                                                                                                  "type": "BaseComboBox",                             "unnamed": 1                                                }
-o_PreTreatmentCreate_acidConcentrate_LabelUnitContainer         = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_acidConcentrate",                                                                                                          "type": "LabelUnitContainer",                       "unnamed": 1                                                }
-o_acidConcentrate_editbutton                                    = {"container": o_PreTreatmentCreate_acidConcentrate_LabelUnitContainer,                 "id": "_editButton",                                                                                                               "type": "IconButton",                               "unnamed": 1,                                               }
-o_PreTreatmentCreate_acidConcentrate_Popup_Text                 = {"container": o_Overlay,                                                                                                                                                                                                  "type": "TitleText",                                "unnamed": 1                                                }
-o_PreTreatmentCreate_qrCode_Image                               = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_qrCode",                                                                                                                   "type": "Image",                                    "unnamed": 1                                                }
-o_PreTreatmentButton                                            = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,                                                "objectName": "_confirmButton",                                                             "type": "ConfirmButton"                                                                                         }
-o_prescription_menuButton                                       = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_prescriptionMenu",                                                                                                         "type": "BaseComboBox",                             "unnamed": 1                                                }
-o_PreTreatmentCreate_dialysateFlowRate_LabelUnitContainer       = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_dialysateFlowRate",                                                                                                        "type": "LabelUnitContainer",                       "unnamed": 1                                                }                                    
-o_PreTreatmentCreate_duration_LabelUnitContainer                = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_duration",                                                                                                                 "type": "LabelUnitContainer",                       "unnamed": 1                                                }
-o_PreTreatmentCreate_heparinStopTime_LabelUnitContainer         = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_heparinStopTime",                                                                                                          "type": "LabelUnitContainer",                       "unnamed": 1                                                }                                                                        
-o_PreTreatmentCreate_heparinStopTime_OFF_Text                   = {"container": o_PreTreatmentCreate_heparinStopTimeControl_ValueAdjuster,                                                                                                                                                  "type": "Text",                                     "unnamed": 1                                                }
-o_PreTreatmentCreate_bicarbonateConcentrate_LabelUnitContainer  = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_bicarbonateConcentrate",                                                                                                   "type": "LabelUnitContainer",                       "unnamed": 1                                                }
-o_PreTreatmentCreate_dialyzerType_LabelUnitContainer            = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_dialyzerType",                                                                                                             "type": "LabelUnitContainer",                       "unnamed": 1                                                }
-o_PreTreatmentCreate_dialysateTemperature_LabelUnitContainer    = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_dialysateTemperature",                                                                                                     "type": "LabelUnitContainer",                       "unnamed": 1                                                }
-o_PreTreatmentCreate_salineBolusVolume_LabelUnitContainer       = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_salineBolusVolume",                                                                                                        "type": "LabelUnitContainer",                       "unnamed": 1                                                }
-o_potassium_LabelUnitContainer                                  = {"container": o_Overlay,                                                               "id": "_potassium",                                                                                                                "type": "LabelUnitContainer",                       "unnamed": 1                                                }
-o_potassium_leftArrow_IconButton                                = {"container": o_potassium_LabelUnitContainer,                                          "id": "_leftArrow",                                                                                                                "type": "IconButton",                               "unnamed": 1                                                }
-o_calcium_LabelUnitContainer                                    = {"container": o_Overlay,                                                               "id": "_calcium",                                                                                                                  "type": "LabelUnitContainer",                       "unnamed": 1                                                }
-o_calcium_leftArrow_IconButton                                  = {"container": o_calcium_LabelUnitContainer,                                            "id": "_leftArrow",                                                                                                                "type": "IconButton",                               "unnamed": 1                                                }
-o_option_combo_box                                              = {"container": o_Overlay,                                                                                                                                                                                                  "type": "Text",                                     "unnamed": 1                                                }
-o_PreTreatmentCreate_bloodFlowRate_slider_Slider                = {"container": o_PreTreatmentCreate_bloodFlowRateControl_ValueAdjuster,                 "id": "_slider",                                                                                                                   "type": "Slider",                                   "unnamed": 1                                                }
-o_PreTreatmentCreate_dialysateFlowRate_slider_Slider            = {"container": o_PreTreatmentCreate_dialysateFlowRateControl_ValueAdjuster,             "id": "_slider",                                                                                                                   "type": "Slider",                                   "unnamed": 1                                                }
-o_PreTreatmentCreate_duration_slider_Slider                     = {"container": o_PreTreatmentCreate_durationControl_ValueAdjuster,                      "id": "_slider",                                                                                                                   "type": "Slider",                                   "unnamed": 1                                                } 
-o_PreTreatmentCreate_heprainBolusVolume_slider_Slider           = {"container": o_PreTreatmentCreate_heparinBolusVolumeControl_ValueAdjuster,            "id": "_slider",                                                                                                                   "type": "Slider",                                   "unnamed": 1                                                }
-o_PreTreatmentCreate_heprainDispensingRate_slider_Slider        = {"container": o_PreTreatmentCreate_heparinDispensingRateControl_ValueAdjuster,         "id": "_slider",                                                                                                                   "type": "Slider",                                   "unnamed": 1                                                }
-o_PreTreatmentCreate_heprainStopTime_slider_Slider              = {"container": o_PreTreatmentCreate_heparinStopTimeControl_ValueAdjuster,               "id": "_slider",                                                                                                                   "type": "Slider",                                   "unnamed": 1                                                }
-o_PreTreatmentCreate_dialysateTemperature_slider_Slider         = {"container": o_PreTreatmentCreate_dialysateTemperatureControl_ValueAdjuster,          "id": "_slider",                                                                                                                   "type": "Slider",                                   "unnamed": 1                                                }
-o_PreTreatmentCreate_salineBolusVolume_slider_Slider            = {"container": o_PreTreatmentCreate_salineBolusVolumeControl_ValueAdjuster,             "id": "_slider",                                                                                                                   "type": "Slider",                                   "unnamed": 1                                                }
-o_PreTreatmentCreate_bicarbonateConcentrateComboBox_BaseComboBox= {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,               "id": "_bicarbonateConcentrateComboBox",                                                                                           "type": "BaseComboBox",                             "unnamed": 1                                                }
-o_PreTreatment_vitalsCombobox_BaseCombobox                      = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,               "id": "_bpMeasurementIntervalControl",                                                                                             "type": "BaseComboBox",                             "unnamed": 1                                                }
-o_PreTreatmentCreate_Text                                       = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,                                                                                                                                            "type": "Text",                                     "unnamed": 1                                                }
-o_createTreatmentRect_TouchRect                                 = {"container": o_standByScreen_MainHome,                                                "id": "_createTreatmentRect",                                                                                                      "type": "TouchRect",                                "unnamed": 1                                                }
-o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry       = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,               "id": "_pretreatmentPatientIDEntry",                                                                                               "type": "TextEntry",                                "unnamed": 1                                                }
-o_preTreatmentStack_Text                                        = {"container": o_preTreatmentStack_PreTreatmentStack,                                                                                                                                                                      "type": "Text",                                     "unnamed": 1                                                }
-o_preTreatmentStack_stepIndicator_StepIndicator                 = {"container": o_preTreatmentStack_PreTreatmentStack,                                   "id": "_stepIndicator",                                                                                                            "type": "StepIndicator",                            "unnamed": 1                                                } 
-o_preTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSample= {"container": o_preTreatmentStack_PreTreatmentStack,                                                                                                  "objectName": "_PreTreatmentSampleStack",                        "type": "PreTreatmentWaterSample"                                                                               }
-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                                                }
+
                                                                                                                                                                                                                                                                                                                                                                                                          
 #prescription header bar                                                                                                                                                                                                                                                                                                                                                                                 
 o_prescriptionButton_IconButton                                 = {"container": o_Gui_MainView,                                                          "id": "_prescriptionButton",                                                                                                                           "type": "IconButton",                                                "unnamed": 1           }
@@ -213,7 +152,6 @@
 o_treatmentHeparin_status_Rectangle                             = {"container": o_treatmentHeparin_TreatmentHeparin,                                     "id": "_status",                                                                                                                                       "type": "Rectangle",                                                 "unnamed": 1           }
 o_option_combo_box                                              = {"container": o_Overlay,                                                                                                                                                                                                                      "type": "Text",                                                      "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_createTreatmentRect_TouchRect                                 = {"container": o_standByScreen_MainHome,                                                "id": "_createTreatmentRect",                                                                                                                          "type": "TouchRect",                                                 "unnamed": 1           }
 o_preTreatmentStack_Text                                        = {"container": o_preTreatmentStack_PreTreatmentStack,                                                                                                                                                                                          "type": "Text",                                                      "unnamed": 1           }
 o_preTreatmentStack_stepIndicator_StepIndicator                 = {"container": o_preTreatmentStack_PreTreatmentStack,                                   "id": "_stepIndicator",                                                                                                                                "type": "StepIndicator",                                             "unnamed": 1           } 
@@ -234,8 +172,6 @@
 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_PatientIDEntry_TextEntry                                      = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_pretreatmentPatientIDEntry",                                                   "type": "TextEntry",                            "unnamed": 1                                                }
-o_PatientIDEntry_TextEntry                                      = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_pretreatmentPatientIDEntry",                                                         "type": "TextEntry",                            "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                                                }                                      
@@ -253,3 +189,28 @@
 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_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           }
\ No newline at end of file
Index: suite_leahi/tst_patient_vitals/test.py
===================================================================
diff -u -ra774225d7e3f88892d90e0dda307b8c17b18899c -r525a83f4f0a858c74d9b475e3760f1921ac1052f
--- suite_leahi/tst_patient_vitals/test.py	(.../test.py)	(revision a774225d7e3f88892d90e0dda307b8c17b18899c)
+++ suite_leahi/tst_patient_vitals/test.py	(.../test.py)	(revision 525a83f4f0a858c74d9b475e3760f1921ac1052f)
@@ -194,10 +194,10 @@
     
 def verify_automatic_vitals_noRejection_Reason():  
 
-    MAX_WAIT = 5 * 60 * 1000  # 5 minutes in seconds
+    MAX_WAIT = 10 * 60 * 1000  # 5 minutes in seconds
     
-    test.verify(waitFor( lambda: vitalsrequest == True, MAX_WAIT), "UI Sending the request to FW")
     td.td_vitals_adjustment_response(vRejectionReason=0)
+    test.verify(waitFor( lambda: vitalsrequest == True, MAX_WAIT), "UI Sending the request to FW")
     td.td_vitals(systolic = 80, 
         diastolic   = 60, 
         heartRate   = 140 )
@@ -352,14 +352,17 @@
         can_interface.register_receiving_publication_function(channel_id,
                                                                message_id,
                                                                handle_patient_vitals_request)
-    startApplication(config.AUT_NAME)
+    startApplication(utility.aut("-q"))
     check_bp_cuff_enabled()
     td.td_operation_mode(TDOpModes.MODE_STAN.value)
     
     
     # verify Standby screen
     test.verify(waitForObjectExists(names.o_standByScreen_MainHome), "In Standby")
-    mouseClick(waitForObject(names.o_createTreatmentRect_TouchRect))
+    hemodialysis        = waitForObject(names.o_createHDTreatment_TouchRect)
+    hemodialysis_btn    = utility.findChildByText(hemodialysis, "Hemodialysis")
+    mouseClick(hemodialysis_btn)
+    td.td_Treatment_Parameters_CreateRx(vRejectionReason =0)
     td.td_operation_mode(TDOpModes.MODE_PRET.value, 0)
     
     
@@ -423,8 +426,8 @@
     #check the title text in the popup
     vitals_titleText = waitForObjectExists(names.o_vitals_Interval_TitleText).text
     test.compare("Vitals Interval", vitals_titleText, "Vitals Interval popup text should be ->"+str("Vitals Interval"))
-    set_value_based_on_target_patientvitals(names.o_bpMeasurementIntervalControl_ValueAdjusterCustom, 10)
-    mouseClick(waitForObject(names.o_vitals_close_btn))
+    set_value_based_on_target_patientvitals(names.o_bpMeasurementIntervalControl_ValueAdjusterCustom, 5)
+    mouseClick(waitForObject(names.o_confirm_button))
     test.endSection()
     
     test.startSection("Verify the vitals data send automatically populate on popup")