Removing error
Merge branch 'evaluation' into Parker