Updated Homework 2