Switched order of setup and controls