externalized query, started fixing the mess Eclipse made.