Here's patch 1.

Tom