Notifications

Improved performance on notifications plus new features