updating from sf-docs 13/11/12