* Merged with Gustavo's code
*Merged with Gustavo's change