Changes after evaluation 1