rearrange to make more sense