Latest changes

Latest working version shown to Rodolfo Espino