match.ls: reworked