Em Andamento

edits to beps as discussed