Address Gustavo's comments