Changes in talk with @mateuscoradini
Fixing AGAIN commit from @mateuscoradini ¬¬