better setup and wait