Converted timing to use steps