updated and refactored upcoming user stories