made a few mods to the notification logic
All working.