Tagged mechanical-upgrade