Updates to the notification branch