Final changes to the ProgrammingAssignment2