Notification switch added, but not tested.