newer query
more work on query