added queries to fit requirements