More grunt upgrades