Adding changes for Programming Assignment 2