A little more rearranging