modified wait methods
modified wait methods