Upgrade for 2.5