First pass at fixing issue with upgrades and discounts
= not -=
Fix discounts with upgrades