Do we need to hardcode a timeout?