Updated to handle additioal races