Upgrade rework