Improve notify support

with an ugly look....