Fixed concurrency problems and overall workflow