Revert to enum method with carry propagation corrections
Revert to enum-based Score