Merging Ivan Gonzalez's comments