rearrange and add partials