Updated DPS calculation