WIP
Minor edits in evaluation