further improvements
further improvements
fixed concurrency issues