Switched order of setup steps