refactor
Notification-Enabled