Updates to ProgrammingAssignment 2