Finish redo of PM system.