Agreed.  I'll rewrite it.