Changing notification structure again...