Story 5.5 (Final for user story 5)