Merge guillermo's changes