updated with cron jobs