Changed func names to better match purpose

Added a P which means priority