updating from sf-docs 10/11/12