added where function and deps