Even smarter matching