more upgrades, data tables