User story 4 and 11