working on notifications
fixing this mess