added notifications
merge