more work on notification