improve code
use new notification api instead of old own