Added step functionality and changed so that certain prompts are not displayed