Added funcalls to eval