CP change, also document where constants come from