Worked on notifications