Added Emil Notification changes