merging Marco & Travis' CC-08 updates