Clean up my botched rebase that mixed up delay and @ usage