Upgrading from 3.3 to 4.0