Added race files
Refactored race logic