Updated the query