Some more upgrades