Homework 4-1: Part 2 -- Looking better, fixed Part 1 too