Consolidating timeout location and increasing it for slower connections