More modular approach

No match.