Fixed Concurrency Issue
Removed Logging