Table switching now seems robust enough