change query for solution