First pass at fixing issue with upgrades and discounts