Implemented user story 3