More improvements. Multithreading