Add rematch feature