USE OUR NEW QUERY SYSTEM