Added new changes of esteban and me

try to cancel the pull request to see what happen.