Timeout calculation change