Draft 1 - retained existing query for next iteration