Improved DPS and HPS calculation.