Handle timeouts better and reduce retry time to 0 in case there was a timeout or 1 if everything went smoothly