Change to complete implementation for Notification function