ENH:  Added Arno's comments