Overhauled schedule logic.