Daniel's suggested edits (incomplete)