regex removed in preparation for streaming