Add Updates: 6145 (thanks, Brian Carpenter)

Credit Brian, Andrew, and Alberto.
Incorporate suggestions from Alberto Leiva