Further reduced Concurrency issues