Implemented run/step option