andWait added