Another rewrite by a collaborator.