Added some concurrency improvements, NOT working yet