Address more of Gustavo's comments