Improve evaluation