redid query to make it more clear