Updated for Assignment 2