2nd shot with updated query