thesis and Evaluation updated