Improve notifying