Added stepping functionality