updated list, moved handleMatch