set up query
fixed merge conflicts