Addition to User story 4.1