Reverting multithreadting and removeing some comments