Some more adds and deletions