Increase the timeout, add a comment