Making TOFU more explicit