Finished the new eval function