Roll forward evaluate.py

The changes to evaluate.py were void in the last merge commit
3e9bf47ce6e96c215c8ab5292748c17b22c21778 ... restoring