Story 6.3  (Final for user story 6)