Fixed design of evaluation
Need to test/debug