changed the evaluation, closes #28