Added stuff for notifications
merging branch