Updated notification to use "will show" handler