notifiction services rework