race improvements

Go toTop