Change to list lookup for discarding matchs