Upgrade to 3.3