Add the other shuttle controllers back in