Improved upgrading mechanismr