Replacer integrated, logging improved