merging additions to .cc