Rearrange for instant deploy