Update based on comments from pwendell