More changes and deletions