changes provoked by CPPcon