Refactored Delay (2nd pass)