Reworking structure upgrades