new queries and modification to prevent inefficiency.