Updates made by Gustavo based on feedback from David Kipling.