Modified for Userstory 1.2