The addition of features for multithreading really messed up with the code structure, please fix
The addition of features for multithreading really messed up with the code structure, please fix