Tagged energy-upgrades