MGO-35 address Gustavo's comments