Feature/plp