Continuing work on notifications