Changed "where" keyword to "such that" in "with" and "without" clauses.