Improve concurrency as per @philwills