Improved waits