Further work/tests to support notification on demand