Update timer to work with single-step