Why change the wait logic?