reduced num of queries, improves