updated queries, made them really cool