started adding support for 'where'