add timeout settings back