Evaluation and improvements