added where clauses