Daniel's edits