Improve race performance