revise the query 1