hw 1 + 2 updated