Q02 added combined query code