Daniel's edits to the latest version; the boxes have not been tackled yet