Lots of changes, removals, and additions