Refactored raceGoat