Switch back to using concurrency