Updated query for testing