Following discussion with Flavien

Changes incorporating the conclusion of the discussion.