Several Changes to reflect simplification of concurrency