Andy's update'd hw 2 and 3