Fixes #2 adds more races