Updated with Notification activity feature only