Additional changes with Enrique's help