Made Changes for Programming Assignment 2