Fixed some issues
0 concurrency support