Final changes to par2 checking