added comments for rematch handling