Rearrange slightly