Removed Timeout
Changes in wait