Upgrading from 2.7 to 3.1.1