#37 (Notification Improvements) - condense dups