comments added and configurable timeout_duration