New version of PL, simplified code