some work on the upgrades