adjustments to conform cc and doc-impro