Completely reorganized notifications chapter