Added EvalState and demo