removed code from user scenarios and steps, added new user stories and steps