Revert "Revert "Algunos cambios en el codigo""

This reverts commit 92d591d83c816f2d17fc57c3aa56d1d2878a6da7.