small changes in notification service