Updated closed loop query to use