Added step forward and back