Updated notifications code.