Added updated query