Update with Paulo's suggestions