Here's the current patch set, version 3, with the modifications
as discussed in the previous exchanges: