incorporations of the new stuff.

When Monty approves / corrects it, I will "port" it to multi-table
updates.