fixed userstory 10 and 11