Now also with upgrades