Fontaine edits