Fixed PM functionality... I think