Improve notification