second commit - notifications, stats updates