Rearranging some things.