Multithreaded now
fixed merge conflict