Notifications buffer update - #1