rearranging to fit the way things ought to be