Scrap matchNum as well