Maybe improved thread afety