User story 12 updated