Upgrade to 3.5