Reorder the setup