Move to new multithreading system