better index and matches