Improved upgrade System