refactoring, pmpc work in progress