diff --git a/script/DelayScan.py b/script/DelayScan.py
index 91aa757..5f90642 100644
--- a/script/DelayScan.py
+++ b/script/DelayScan.py
@@ -70,7 +70,14 @@ time.sleep(1.0)
 
 caput (TIME_DELAY_SET, START)
 caput (TIME_DELAY_START, 1)
-wait_channel(TIME_DELAY_COMPLETE, 'SCAN Complete')
+'''if TIME_DELAY_SET == 0:
+    caput (LPP_DELAY, DELAY)
+    caput (LPP_FINE_DELAY, FINE_DELAY)
+else
+  ''' 
+timeout_1= (caget TIME_DELAY_SET)/(caget TIME_DELAY_VAL)
+print timeout_1
+wait_channel(TIME_DELAY_COMPLETE, 'SCAN Complete', timeout=10)
  
 ###############################################################################
 # Plotting