updated due to changes in the query