Index: suite_leahi/shared/scripts/configuration/navigation.py
===================================================================
diff -u -r0130028593cbcfc6ec7e97af4b4c48f26b96898b -r3b1585c8cf24c14498f1ebd55f571d09f55e472e
--- suite_leahi/shared/scripts/configuration/navigation.py	(.../navigation.py)	(revision 0130028593cbcfc6ec7e97af4b4c48f26b96898b)
+++ suite_leahi/shared/scripts/configuration/navigation.py	(.../navigation.py)	(revision 3b1585c8cf24c14498f1ebd55f571d09f55e472e)
@@ -36,8 +36,6 @@
             ),
         )
         
-
-
 def get_ini_value(conf_path: str , section: str, key: str):
     """
     Method to get the advanced option from the System.conf file
@@ -66,40 +64,29 @@
          
     """
     test.startSection("Method to navigation in the pretreatment page ")
+    stepId = squish.waitForObjectExists(names.o_preTreatmentStack_stepIndicator_StepIndicator)
+    stepnames = utility.findAllObjectsById(stepId, "_text")
     value = get_ini_value("/home/denali/Public/luis/config/configurations/Settings/System.conf", 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)
-        stepId = squish.waitForObjectExists(names.o_preTreatmentStack_stepIndicator_StepIndicator)
-        values = utility.findAllObjectsById(stepId, "_text")
-        for input_field in values[3:]:
-            test.log(str(input_field.text))
-            if str(input_field.text) == "Water Sample":
-                squish.mouseClick(squish.waitForObject(names.o_PreTreatmentSampleStack_button_TouchRect))            
-            if str(input_field.text) == vStep_name:
-                break
-            else:
-                Nextbutton = utility.setObjectText(obj =names.o_preTreatmentStack_Text, text =config.NEXT)
-                squish.mouseClick(Nextbutton)
-    else:
-        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)
-        stepId = squish.waitForObjectExists(names.o_preTreatmentStack_stepIndicator_StepIndicator)
-        values = utility.findAllObjectsById(stepId, "_text")
-        for input_field in values[3:]:
-            test.log(str(input_field.text))
-            if str(input_field.text) == "Water Sample":
-                squish.mouseClick(waitForObject(names.o_PreTreatmentSampleStack_button_TouchRect))
+
+    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)
+    stepId = squish.waitForObjectExists(names.o_preTreatmentStack_stepIndicator_StepIndicator)
+    values = utility.findAllObjectsById(stepId, "_text")
+    for input_field in standard:
+        test.log(str(input_field.text))
+        if str(input_field.text) == "Water Sample":
+            squish.mouseClick(squish.waitForObject(names.o_PreTreatmentSampleStack_button_TouchRect))
                 
-            if str(input_field.text) == vStep_name:
-                break
-            else:
-                Nextbutton = utility.setObjectText(obj =names.o_preTreatmentStack_Text, text =config.NEXT)
-                squish.mouseClick(Nextbutton)
+        if str(input_field.text) == vStep_name:
+            break
+        else:
+            Nextbutton = utility.setObjectText(obj =names.o_preTreatmentStack_Text, text =config.NEXT)
+            squish.mouseClick(Nextbutton)
         
-    test.endSection() 
-    
\ No newline at end of file
+    test.endSection()  
\ No newline at end of file