TeamraceController improved