[Zhenghan] notification logic completed