Some nice upgrades