Programming Assignment 2 changes