Daniel's latest (and final?) edits