Updated handling of stage timer