all done except for and queries