Fixed double counting hpr/mpr issue, I need to test more thoroughly before pushing to master next time.