now working in prod. remaining a pb in oauth popup and cron feature