Updated NotificationClicker