Changed threading strategy