Here's my patch again since Alan didn't get it.