upgrades and contracts now working