Adding changes for Assignment 1