Changed threading method