minor edits + CCF