Marco

Finish Marco's pull request, by making the large Connected array initialized by formula, to keep only 7 parameters.

No functional change.