Modify order of setup instructions