Changed all the waits to long