restricting notification_queue, minor changes to be done