update notification handling (testing/unstable)