Make Notification optional