fixing concurrency issues
removing parallelism;
working on test