added hw 6, 7