Beginning of Notification polish