finalized my version of pdpa6