Index: suite_leahi/shared/scripts/configuration/utility.py
===================================================================
diff -u -r9751968c3118396daa677c2e95961aba5b0bf001 -r3240e0c4aa8e9c80663df4e810734c73813d15d7
--- suite_leahi/shared/scripts/configuration/utility.py	(.../utility.py)	(revision 9751968c3118396daa677c2e95961aba5b0bf001)
+++ suite_leahi/shared/scripts/configuration/utility.py	(.../utility.py)	(revision 3240e0c4aa8e9c80663df4e810734c73813d15d7)
@@ -136,14 +136,16 @@
     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)
+    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)
     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)
+    set_value_based_on_target(names.o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom,5.0)
     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))
@@ -167,10 +169,9 @@
                                             vDialysateTempRejectReason                   = 0,
                                             vHeparinDispensingRateRejectReason           = 0,
                                             vHeparinBolusVolumeRejectReason              = 0
-                                           )
-    
-    confirmButton = setObjectText(obj = names.o_preTreatmentStack_Text,text = config.CONFIRM )
-    squish.mouseClick(squish.waitForObject(confirmButton))
+                                            )
+    confirm = squish.waitForObjectExists(names.o_preTreatmentStack_confirmButton_ConfirmButton, 3000)
+    squish.mouseClick(confirm)
     test.endSection()
     
 def findAllObjectsById(parent, target_id):