Changes to upgrade