Change how timeouts are set and calculated a bit