Revert "Revert "uar correcciones""

This reverts commit 3f73b241ede5c437a8210fd4548d47f676b493c7.
merge dev