Added DPS Calculation, Upgrade Data