move timeouts to timespans