Em Andamento

Finish all the change requests in the file