Improved race joining, etc...