Upgrade to 3.4