Improved evaluation script