changes for no timeout v2