removed double querying