upgrades, hopfully faster