added hw 1 and 2