Added logic to save a race