Updated ProgrammingAssignment2