Updated for DiscountConditions