Notifications improved