added some more PL stuff from lopes