odels and queries adjusted