queries upgraded to 3