Added rest of the wait methods