some deletions and additions