Update

Minimun changes on the code