Updated for HW4 Part 1.