Rearranging things a bit.