Rewritten patch.

Dan