Fixed CCF, attached interdiff with #74.