more PMD (almost done)