rearrange innards + save