Notifications: last commit had some performance issues