WIP: added upgrades to new module