Included Henri's comments.