Updated Homework Assignment 2