Updated some of the queries