Rearranged the states to fit the new user story