TB: Move t31 in, move t24 out