Change order of setup