concurrency issues resolved