Upgrade to 3.1