Re-arranging some things, getting rid of some things, adding some things.