rearrange a few things