Improved upgrade