reworking upstreams