Cupcake upgrades

[placeholder until merge-ready]