refactored and added user stories