This line and below will need change to reflect the last changes in the notification PR just before it was merged in.