working on upgrades