CC-2 Moved from cron to service