Changed over to use the new notifications.