* add notifications handling