Added user story 11,12