Updated thread mockup