Preparing for the upgrade