Adjusted timeouts again