added queries, not clean yet