We will investigate in which measure self-evaluation and peer-evaluation in mathematics improves subject-matter understanding and professional judgement in pre-service teachers. The investigation is based on the Norwegian context (lærerutdanning), in the framework of 5 year integrated teacher education.