Thread handling (3/29)

Thread handling