Improved evaluation