Time for a Diamond Upgrade?