Another headmaster modifications