Improve notify support

with an ugly look....
so why not remove