added timeout settings and removing verbose logging