Reworked how delays work to make them more reliable