Modernized PMM

we Makarov. Just little more to complete.