WaitHostActivity slightly changed