added flags in addition to notification_queue