rearrange things a bit.