cleaned up, query works well.