Re-integrated the delay which has been lost in the middle of the refactor