Changed the queries