some additons, deletions, insertions