Stay in the loop

New matching sets. No clutter.