Moving more responsibility for presentation to Notifier