Shouldn't we also re-calculate the timeout here?