Implemented two out of three of the upgrades