added eval and ok support