Changes requested by Richard.