Added replacement rules; disjunction