Here's an updated patch.

Tom