Latest updates for race condition