Rearrange the evaluation section