changed query once again