More work on notifications