Changes required for Programming Assignment 2