Updates based on comments 8/20/14