Final edits to CF2