Combined the fact inside the evaluationContext so that only one thing gets passed around