Round 2

Changes for updating notifications.