Adjusted thread behaviour