Major simplification: MATCHES and CHALLENGES segments removed.