use notifications-helper and fixes client