added my own query builder