Improved upgrade process.