adjusted queries, added one