modified with jvazquez-r7 comments
Revert "modified with jvazquez-r7 comments"

This reverts commit 2381c87483b2dd72d148acc616295229a4bba0e9.
deleted cause error in commit