refactoring for connection timeout and shorter loading indication delay