Applies comments from Jonathan Lennox