Improved Performance and Code
Fixed concurrency error
Improved Performance and Code
Fixed concurrency error