Changes requested by Mark Rowe.