More edits for James.