Changed notifaction handling.