Revert "Revert "Update for upgradelist""

This reverts commit 0a2815a10ada63fcfed556ff7e726ccd885a2696.