still playing with my queries