Optimized some concurrency