Varun/n+1queries