Thread handling (6/29)

Thread handling