changes to make things work as expected after rebase with master branch
having notifications