Updated query once again