Improve sample (add notify message)