adding reinit of Evaluation
merging Eric and Karen commits