still working
Added code for individual queries