Wip upgrades