moved subs to pm