trying to fix bug with upgrades
trying to fix merge errors