Added checking for timeouts and delays