removed query for speed