Index: suite_leahi/shared/scripts/configuration/utility.py
===================================================================
diff -u -r0130028593cbcfc6ec7e97af4b4c48f26b96898b -r3b1585c8cf24c14498f1ebd55f571d09f55e472e
--- suite_leahi/shared/scripts/configuration/utility.py	(.../utility.py)	(revision 0130028593cbcfc6ec7e97af4b4c48f26b96898b)
+++ suite_leahi/shared/scripts/configuration/utility.py	(.../utility.py)	(revision 3b1585c8cf24c14498f1ebd55f571d09f55e472e)
@@ -136,9 +136,11 @@
     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)
@@ -167,12 +169,9 @@
                                             vDialysateTempRejectReason                   = 0,
                                             vHeparinDispensingRateRejectReason           = 0,
                                             vHeparinBolusVolumeRejectReason              = 0
-                                           )
-    
-    # confirm = squish.waitFor(lambda:object.exists(names.o_preTreatmentStack_confirmButton_ConfirmButton), 3000)
-    # step_id = squish.waitForObjectExists(names.o_preTreatmentStack_PreTreatmentStack)
-    squish.mouseClick(names.o_preTreatmentStack_confirmButton_ConfirmButton)                                  
-   
+                                            )
+    confirm = squish.waitForObjectExists(names.o_preTreatmentStack_confirmButton_ConfirmButton, 3000)
+    squish.mouseClick(confirm)
     test.endSection()
     
 def findAllObjectsById(parent, target_id):