add comments to change for timeout checking