changing CC mapping to something that makes more sense
preparing beta release