rearrange some stuff