Re-order methods.
All params working with correct counts and match lists.