Improved upgrading mechanism