Revert some changes.  Add others.