Changes to PP5Enroll, proposed fix to #54