Pdp

A more stable version to merge in master