Refactored delay (removed delayN etc)