some PMD modifications