Re-add concurrency to make