Refactor

`new_thread` here used?