Addition to User story 4