continue edits for cf v6