Tried fixing CCF, attached interdiff for same.