move this to a dedicated subscriber