My changes to ProgrammingAssignment2