rearrange things once again