Upgrade to GP Calculation