Integrated some comments from carbon pull 126