Changed The Waits a bit