rearrange customizations a bit