story 1: fixed all changes