Including Thiago's suggestions