Increased the timeout to 30 seconds