Revert "Revert "melhorias:""

This reverts commit 0ba924b3bfa6bf120224651db9cd791a86f7f9ee.