Working on notification system