@fabio-pimenta: Keep the good