added the query, need now to focus on the client