more changes to query