Refactor about Notify flow