Changes from the draft are in red.