rearrange metadata some more