add concurrent back where it makes sense