Reworked the timing behavior