Lot of changes asked by Eliott Sales de Andrade