modify order of setup