Adding changes from Juan