Rewrote the logic of notification
Merge branch 'hotfix/notification'

* hotfix/notification:
  Rewrote the logic of notification