Thread handling (5/29)

Thread handling