Some editing...