Added rest of the old eval back.