Marge the author's updates.

Marge the author's updates.