Rearrange the setup