improved Buyer logic
improved Upgrade logic