working on rematch feature