make work with new thread library
3 files changed