Added the ability to return current step and total number of steps