Rearrange requirements