ADD param to allow flexible timeouts