Adding check for network timeout and commenting