accomodate upstream, duh