refactor the place where evals are called