New Upgrade changes