Updates to ProgammingAssigment2