modified wait methods