various additions/deletions